Merge e7b9060 into a368de5

curationexperts · Feb 2, 2018 · 73ad11c · 73ad11c
2 parents a368de5 + e7b9060
commit 73ad11c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/config/database.yml b/config/database.yml
@@ -1,7 +1,7 @@
 default: &default
   adapter:  postgresql
   encoding: unicode
-  pool:     5
+  pool:     25
   timeout:  5000
 
 development:
@@ -15,8 +15,10 @@ test:
   <<: *default
   database: mahonia_test
 
+# Note: production credentials are stored in .env.production file
+# on the server, originally configured by ansible
 production:
   <<: *default
-  database: mahonia_production
-  username: mahonia
-  password: password1
+  database: <%= ENV['DATABASE_NAME'] %>
+  username: <%= ENV['DATABASE_USERNAME'] %>
+  password: <%= ENV['DATABASE_PASSWORD'] %>
diff --git a/config/deploy.rb b/config/deploy.rb
@@ -24,7 +24,6 @@
 append :linked_dirs, "log"
 append :linked_dirs, "public/assets"
 
-append :linked_files, "config/database.yml"
 append :linked_files, "config/secrets.yml"
 append :linked_files, ".env.production"