aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2013-12-18 19:16:32 +0100
committerXavier Noria <fxn@hashref.com>2013-12-18 19:16:32 +0100
commit6d894cf3ea67192e8be3946b0d97e90fcae4cd0f (patch)
tree3d8a7cf96d7c15188a409c4996998c53d7dc8b88
parent7b5cf7ef9dce90dc5352a0f220e65722fe44a962 (diff)
downloadrails-6d894cf3ea67192e8be3946b0d97e90fcae4cd0f.tar.gz
rails-6d894cf3ea67192e8be3946b0d97e90fcae4cd0f.tar.bz2
rails-6d894cf3ea67192e8be3946b0d97e90fcae4cd0f.zip
make clear that config/secrets.yml passes through ERB and therefore supports ENV
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/secrets.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/secrets.yml b/railties/lib/rails/generators/rails/app/templates/config/secrets.yml
index 50c1d1d8c7..b32e4bf2a6 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/secrets.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/secrets.yml
@@ -16,5 +16,11 @@ development:
test:
secret_key_base: <%= app_secret %>
+# This YAML file is processed by ERB first (as others). In particular the
+# production environment can set the secret via an environment variable
+# this way:
+#
+# secret_key_base: <%%= ENV['SECRET_KEY_BASE'] %>
+#
production:
secret_key_base: <%= app_secret %>