[DRE-commits] r4748 - trunk/redmine/debian/patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2010-02-20 02:39:36 +0000 (Sat, 20 Feb 2010)
New Revision: 4748

Modified:
   trunk/redmine/debian/patches/0015-Move-session-configuration-to-YML-file-next-to-datab.patch
Log:
Initialize session config before loading plugins.

Plugins could initialize ActiveSupport, which would not find session config.

Modified: trunk/redmine/debian/patches/0015-Move-session-configuration-to-YML-file-next-to-datab.patch
===================================================================
--- trunk/redmine/debian/patches/0015-Move-session-configuration-to-YML-file-next-to-datab.patch	2010-02-19 11:43:44 UTC (rev 4747)
+++ trunk/redmine/debian/patches/0015-Move-session-configuration-to-YML-file-next-to-datab.patch	2010-02-20 02:39:36 UTC (rev 4748)
@@ -3,28 +3,29 @@
 Subject: [PATCH] Move session configuration to YML file, next to database.yml path.
 
 ---
- config/initializers/50-session.rb |   11 +++++++++++
- lib/tasks/initializers.rake       |   36 ++++++++++++++++++++++--------------
- 2 files changed, 33 insertions(+), 14 deletions(-)
- create mode 100644 config/initializers/50-session.rb
 
-diff --git a/config/initializers/50-session.rb b/config/initializers/50-session.rb
-new file mode 100644
-index 0000000..34707c5
---- /dev/null
-+++ b/config/initializers/50-session.rb
-@@ -0,0 +1,11 @@
+--- redmine-0.9.2.orig/config/environment.rb
++++ redmine-0.9.2/config/environment.rb
+@@ -19,6 +19,19 @@ RAILS_GEM_VERSION = '2.2.3' unless defin
+ # Bootstrap the Rails environment, frameworks, and default configuration
+ require File.join(File.dirname(__FILE__), 'boot')
+ 
 +# loads cookie based session session and secret keys
++# this is needed here because initializers are loaded after plugins,
++# and some plugins initialize ActionController which requires a secret to be set.
 +# 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'
 +ActionController::Base.session = {
 +  :session_key => sessionconfig[Rails.env]['session_key'],
 +  :secret => sessionconfig[Rails.env]['secret'],
 +  :session_path => ENV['RAILS_RELATIVE_URL_ROOT'] ? ENV['RAILS_RELATIVE_URL_ROOT'] : '/'
 +}
++
+ # Load Engine plugin if available
+ begin
+   require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
 diff --git a/lib/tasks/initializers.rake b/lib/tasks/initializers.rake
 index ce87475..a108204 100644
 --- a/lib/tasks/initializers.rake