about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--config/deploy.rb2
-rw-r--r--config/initializers/devise.rb3
2 files changed, 1 insertions, 4 deletions
diff --git a/config/deploy.rb b/config/deploy.rb index 16c6257..a97d3a7 100644 --- a/config/deploy.rb +++ b/config/deploy.rb
@@ -21,7 +21,7 @@ set :deploy_to, "/srv/www/thoughts"
21# set :pty, true 21# set :pty, true
22 22
23# Default value for :linked_files is [] 23# Default value for :linked_files is []
24append :linked_files, "config/database.yml" 24append :linked_files, "config/database.yml", "config/secrets.yml"
25 25
26# Default value for linked_dirs is [] 26# Default value for linked_dirs is []
27append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets", "public/uploads" 27append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets", "public/uploads"
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 822cec4..f85c0a6 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb
@@ -7,9 +7,6 @@ Devise.setup do |config|
7 # Devise will use the `secret_key_base` as its `secret_key` 7 # Devise will use the `secret_key_base` as its `secret_key`
8 # by default. You can change it below and use your own secret key. 8 # by default. You can change it below and use your own secret key.
9 # config.secret_key = 'f85d289a63b03808f899604ae6f3b1ba93430a8a7e9a5c0ee817471e4d4e201f000e8d42386392d4c24add7b4e2f0e011ea491c1febb57b37301e63b67f0ed60' 9 # config.secret_key = 'f85d289a63b03808f899604ae6f3b1ba93430a8a7e9a5c0ee817471e4d4e201f000e8d42386392d4c24add7b4e2f0e011ea491c1febb57b37301e63b67f0ed60'
10 if Rails.env == 'production'
11 config.secret_key = ENV['DEVISE_SECRET_KEY']
12 end
13 10
14 # ==> Mailer Configuration 11 # ==> Mailer Configuration
15 # Configure the e-mail address which will be shown in Devise::Mailer, 12 # Configure the e-mail address which will be shown in Devise::Mailer,