From b50a05cac32f7e1f70ea622e2c82972c87391dfa Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 23 Feb 2007 00:09:22 +0000 Subject: [PATCH] Move session settings closer together git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6211 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/environments/environment.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb index 097bb803d1..6ffacd4023 100644 --- a/railties/environments/environment.rb +++ b/railties/environments/environment.rb @@ -26,6 +26,13 @@ Rails::Initializer.run do |config| # (by default production uses :info, the others :debug) # config.log_level = :debug + # Your secret key for verifying cookie session data integrity. + # If you change this key, all old sessions will become invalid! + config.action_controller.session = { + :session_key => '_<%= app_name %>_session', + :secret => '<%= CGI::Session.generate_unique_id(app_name) %>' + } + # Use the database for sessions instead of the file system # (create the session table with 'rake db:sessions:create') # config.action_controller.session_store = :active_record_store @@ -41,13 +48,6 @@ Rails::Initializer.run do |config| # Make Active Record use UTC-base instead of local time # config.active_record.default_timezone = :utc - # Your secret key for verifying cookie session data integrity. - # If you change this key, all old sessions will become invalid! - config.action_controller.session = { - :session_key => '_<%= app_name %>_session', - :secret => '<%= CGI::Session.generate_unique_id(app_name) %>' - } - # See Rails::Configuration for more options end