Merge branch 'master' of git@github.com:fudgestudios/bort

otopaz · Oct 7, 2008 · 87072a7 · 87072a7
2 parents 6caa6e5 + df09fe5
commit 87072a7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/config/database.yml b/config/database.yml
@@ -24,6 +24,18 @@ test:
   # username: root
   # password:
 
+staging:
+  # Sqlite3 Settings    
+  adapter: sqlite3
+  database: db/staging.sqlite3
+  timeout: 5000
+  # Mysql Settings
+  # adapter: mysql
+  # encoding: utf8
+  # database: test_development
+  # username: root
+  # password:  
+
 production:
   # Sqlite3 Settings
   adapter: sqlite3

diff --git a/config/settings.yml b/config/settings.yml
@@ -5,6 +5,11 @@ development: &non_production_settings
 
 test:
   <<: *non_production_settings
+
+staging:
+  site_url: http://staging.example.com
+  site_name: Bort
+  admin_email: bort@bort.com  
 
 production:
   site_url: http://www.example.com