summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/database.yml1
-rw-r--r--config/deploy.rb2
2 files changed, 3 insertions, 0 deletions
diff --git a/config/database.yml b/config/database.yml
index bf858ca..4ba4454 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -81,5 +81,6 @@ test:
#
production:
<<: *default
+ database: <%= ENV["ESOTERRA_DATABASE_NAME"] %>
username: <%= ENV["ESOTERRA_DATABASE_USERNAME"] %>
password: <%= ENV["ESOTERRA_DATABASE_PASSWORD"] %>
diff --git a/config/deploy.rb b/config/deploy.rb
index 8384427..925f0d6 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -17,6 +17,8 @@ append :linked_files, "config/database.yml", "config/master.key"
set :keep_assets, 2
set :keep_releases, 5
+set :conditionally_migrate, true
+
set :rvm_custom_path, "/usr/share/rvm" # Needed for DO one-click Rails install setup
# upload master.key and database.yml