summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2017-03-22 10:34:12 +0100
committerAzul <azul@riseup.net>2017-03-23 08:47:25 +0100
commitd03082680007d30b8883495c2ae5110daec14f71 (patch)
tree96ebbcb9f18dacadd0886efe029e1e91531f938b /config/initializers
parent84be2700a09808ccae4a3f68a8586ce9aa74066c (diff)
upgrade: use rails4s 'secret_key_base'
This will get us encrypted cookies but also requires changes to the platform. fixes #23
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/secret_token.rb14
1 files changed, 10 insertions, 4 deletions
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index bdd9b1c..4a2e6d7 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -5,8 +5,14 @@
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
-if token = APP_CONFIG[:secret_token]
- LeapWeb::Application.config.secret_token = token
-else
- raise StandardError.new("No secret_token defined in config/config.yml - please provide one.")
+unless APP_CONFIG[:secret_key_base] or APP_CONFIG[:secret_token]
+ raise StandardError.new("No secret_key_base or secret_token defined in config/config.yml - please provide one.")
+end
+
+if APP_CONFIG[:secret_key_base]
+ LeapWeb::Application.config.secret_key_base = APP_CONFIG[:secret_key_base]
+end
+
+if APP_CONFIG[:secret_token]
+ LeapWeb::Application.config.secret_token = APP_CONFIG[:secret_token]
end