Commit 68645158

mo k <mo@mokhan.ca>
2012-09-22 22:58:46
remove staging database config and collapse into production config.
master
1 parent 82f244e
Changed files (4)
config
database.production.yml.example
database.staging.yml.example
database.yml.example
deploy.rb
config/database.production.yml.example
@@ -1,3 +1,12 @@
+staging:
+  adapter: postgresql
+  encoding: unicode
+  host: localhost
+  database: cakeside_production
+  pool: 5
+  username: cakeside
+  password: password
+
 production:
   adapter: postgresql
   encoding: unicode
config/database.staging.yml.example
@@ -1,8 +0,0 @@
-staging:
-  adapter: postgresql
-  encoding: unicode
-  host: localhost
-  database: cakeside_production
-  pool: 5
-  username: cakeside
-  password: password
config/database.yml.example
@@ -14,21 +14,3 @@ test:
   database: db/test.sqlite3
   pool: 5
   timeout: 5000
-
-staging:
-  adapter: postgresql
-  encoding: unicode
-  host: localhost
-  database: cakeside_production
-  pool: 5
-  username: cakeside
-  password: password
-
-production:
-  adapter: postgresql
-  encoding: unicode
-  host: localhost
-  database: cakeside_production
-  pool: 5
-  username: cakeside
-  password: password
config/deploy.rb
@@ -27,8 +27,7 @@ after 'deploy:update_code', 'deploy:symlink_db'
 
 namespace :deploy do
   task :symlink_db, :roles => :app do
-    environment = ARGV[0]
-    run "ln -nfs #{release_path}/config/database.#{environment}.yml.example #{release_path}/config/database.yml"
+    run "ln -nfs #{release_path}/config/database.production.yml.example #{release_path}/config/database.yml"
     #run "ln -nfs #{deploy_to}/shared/config/database.yml #{release_path}/config/database.yml"
   end
 end