[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 0c511a61d57004e401d12ed866fe9e4eaaf5c6ae
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Oct 15 20:33:13 2012 +0200

    Try to mangle tmp directory into RAILS_VAR

diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index 173997b..96176b9 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -13,15 +13,6 @@ Last-Update: 2012-01-19
  
    cattr_accessor :thumbnails_storage_path
    @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
---- a/config/initializers/10-patches.rb
-+++ b/config/initializers/10-patches.rb
-@@ -147,3 +147,6 @@ module ActionController
-     end
-   end
- end
-+
-+# the session store
-+ActionController::Base.session_options[:tmpdir] = File.join(ENV['RAILS_VAR'], 'sessions') unless !ENV['RAILS_VAR']
 --- a/lib/redmine/configuration.rb
 +++ b/lib/redmine/configuration.rb
 @@ -31,7 +31,7 @@ module Redmine
@@ -55,7 +46,7 @@ Last-Update: 2012-01-19
            pdf_encoding = l(:general_pdf_encoding).upcase
 --- /dev/null
 +++ b/config/additional_environment.rb
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,20 @@
 +Rails.env ||= ActiveSupport::StringInquirer.new('production')
 +
 +# for debian package : setup proper environment variables and paths
@@ -73,3 +64,6 @@ Last-Update: 2012-01-19
 +
 +# Set Active Record's database.yml path
 +config.paths['config/database'] = File.join(ENV['RAILS_ETC'], 'database.yml') unless !ENV['RAILS_ETC']
++
++# the session store (???)
++config.paths['tmp'] = ENV['RAILS_VAR']

-- 
redmine.git