[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.4.4+dfsg1-1-35-g042f641

[Ondřej Surý]

The following commit has been merged in the master-experimental branch:
commit 7fd48c73145e4fda467225029a24f88366961e64
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Oct 15 18:43:36 2012 +0200

    The session secret configuration is now config.secret_token

diff --git a/debian/patches/2003_externalize_session_config.patch b/debian/patches/2003_externalize_session_config.patch
index e061230..42c9d0c 100644
--- a/debian/patches/2003_externalize_session_config.patch
+++ b/debian/patches/2003_externalize_session_config.patch
@@ -61,11 +61,11 @@ Last-Update: 2010-01-10
 +# crash if file not found
 +filename = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'session.yml') : File.join(File.dirname(__FILE__), '..', 'session.yml')
 +sessionconfig = YAML::load_file(filename)
-+require 'action_controller'
 +relativeUrlRoot = ENV['RAILS_RELATIVE_URL_ROOT']
 +
 +config.session_store :cookie_store, {
 +  :key => sessionconfig[Rails.env]['key'],
-+  :secret => sessionconfig[Rails.env]['secret'],
 +  :path => (relativeUrlRoot.blank?) ? '/' : relativeUrlRoot
 +}
++
++config.secret_token = sessionconfig[Rails.env]['secret']

-- 
redmine.git