diff options
| author | José Valim <jose.valim@gmail.com> | 2010-04-05 10:52:47 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-04-05 12:00:24 +0200 |
| commit | 6690d662920f0db854f7303cd2a5a36c72299199 (patch) | |
| tree | 9e531ce7d2945b5eb0ce06e63277cc06361b37c0 /railties/lib/rails/generators | |
| parent | 5c8b4c6e231257bc08d32722e098927885e5e74d (diff) | |
| download | rails-6690d662920f0db854f7303cd2a5a36c72299199.tar.gz rails-6690d662920f0db854f7303cd2a5a36c72299199.tar.bz2 rails-6690d662920f0db854f7303cd2a5a36c72299199.zip | |
Rename config.cookie_secret to config.secret_token and pass it as configuration in request.env. This is another step forward removing global configuration.
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt (renamed from railties/lib/rails/generators/rails/app/templates/config/initializers/cookie_verification_secret.rb.tt) | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/cookie_verification_secret.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt index be627fbbcc..c2fa31aadb 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/cookie_verification_secret.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt @@ -4,4 +4,4 @@ # If you change this key, all old signed cookies will become invalid! # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. -Rails.application.config.cookie_secret = '<%= app_secret %>' +Rails.application.config.secret_token = '<%= app_secret %>' diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt index 9e32fb930e..a869a21e2c 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt @@ -1,8 +1,6 @@ # Be sure to restart your server when you modify this file. -Rails.application.config.session_store :cookie_store, { - :key => '_<%= app_name %>_session', -} +Rails.application.config.session_store :cookie_store, :key => '_<%= app_name %>_session' # Use the database for sessions instead of the cookie-based default, # which shouldn't be used to store highly confidential information |