<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>config/couchdb.yml.example</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -18,4 +18,4 @@ config.action_mailer.raise_delivery_errors = false
 
 require 'couchrest'
 SERVER = CouchRest.new
-DB = SERVER.database!('soapbox-dev')
\ No newline at end of file
+DB = SERVER.database!(CouchDB['database'])
\ No newline at end of file</diff>
      <filename>config/environments/development.rb</filename>
    </modified>
    <modified>
      <diff>@@ -30,4 +30,4 @@ config.action_view.cache_template_loading            = true
 
 require 'couchrest'
 SERVER = CouchRest.new
-DB = SERVER.database!('soapbox')
\ No newline at end of file
+DB = SERVER.database!(CouchDB['database'])
\ No newline at end of file</diff>
      <filename>config/environments/production.rb</filename>
    </modified>
    <modified>
      <diff>@@ -34,4 +34,4 @@ config.gem 'jscruggs-metric_fu', :version =&gt; '1.1.4', :lib =&gt; 'metric_fu', :sour
 # set up the couchDB database
 require 'couchrest'
 SERVER = CouchRest.new
-DB = SERVER.database!('soapbox-test')
\ No newline at end of file
+DB = SERVER.database!(CouchDB['database'])
\ No newline at end of file</diff>
      <filename>config/environments/test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1 +1,2 @@
-Soapbox = YAML.load_file(&quot;#{RAILS_ROOT}/config/soapbox.yml&quot;)[RAILS_ENV]
\ No newline at end of file
+Soapbox = YAML.load_file(&quot;#{RAILS_ROOT}/config/soapbox.yml&quot;)[RAILS_ENV]
+CouchDB = YAML.load_file(&quot;#{RAILS_ROOT}/config/couchdb.yml&quot;)[RAILS_ENV] 
\ No newline at end of file</diff>
      <filename>config/initializers/load_config.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,23 @@
-blog_title: On The Soapbox
-#strapline: a good one
+development: &amp;development
+  blog_title: Change me
+  #strapline: a good one
+  #blog_description: a good one
 
-# the intense debate key
-#intensedebate_api_key: 
\ No newline at end of file
+  # the intense debate key
+  intensedebate_api_key:
+  comments_on: false
+  
+  google_analytics_api_key: UA-597324-7
+  web_analytics_on: false
+
+  # HTTP Caching
+  #
+  # How long do we set the max-age header for
+  blog_post_max_age: 30
+  blog_index_page_max_age: 30
+  
+test:
+  &lt;&lt;: *development
+
+production:
+  &lt;&lt;: *development
\ No newline at end of file</diff>
      <filename>config/soapbox.yml.example</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>cd9798ad91fd6841a58a76ae10b57c1578d2c015</id>
    </parent>
  </parents>
  <author>
    <name>Ben Aldred</name>
    <email>benaldred@gmail.com</email>
  </author>
  <url>http://github.com/benaldred/soapbox/commit/4f7f50f0cf567b5261ec3a42a1cc1d7abf01b488</url>
  <id>4f7f50f0cf567b5261ec3a42a1cc1d7abf01b488</id>
  <committed-date>2009-10-26T01:53:50-07:00</committed-date>
  <authored-date>2009-10-26T01:53:50-07:00</authored-date>
  <message>move couchdb details into config file</message>
  <tree>9b2c3fec57dddefcb414639be50a6debb3bee2ea</tree>
  <committer>
    <name>Ben Aldred</name>
    <email>benaldred@gmail.com</email>
  </committer>
</commit>
