[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 757dddc8f630c2300ed28a9b51edd24870cf7c59
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Oct 15 00:17:18 2012 +0200

    Use conf.paths now for overriding default paths

diff --git a/debian/patches/2002_FHS_through_env_vars.patch b/debian/patches/2002_FHS_through_env_vars.patch
index f1500d9..1b5ab7d 100644
--- a/debian/patches/2002_FHS_through_env_vars.patch
+++ b/debian/patches/2002_FHS_through_env_vars.patch
@@ -53,12 +53,9 @@ Last-Update: 2012-01-19
            FileUtils.mkdir_p @@k_path_cache unless File::exist?(@@k_path_cache)
            set_language_if_valid lang
            pdf_encoding = l(:general_pdf_encoding).upcase
---- a/config/environment.rb
-+++ b/config/environment.rb
-@@ -1,6 +1,24 @@
- # Load the rails application
- require File.expand_path('../application', __FILE__)
- 
+--- /dev/null
++++ b/config/additional_environment.rb
+@@ -0,0 +1,17 @@
 +ENV['RAILS_ENV'] ||= 'production'
 +
 +# for debian package : setup proper environment variables and paths
@@ -70,13 +67,9 @@ Last-Update: 2012-01-19
 +ENV['RAILS_CACHE'] ||= "/var/cache/redmine/#{ENV['X_DEBIAN_SITEID']}"
 +
 +# log path
-+config.log_path = File.join(ENV['RAILS_LOG'], "#{ENV['RAILS_ENV']}.log") unless !ENV['RAILS_LOG']
++config.paths['log'] = File.join(ENV['RAILS_LOG'], "#{ENV['RAILS_ENV']}.log") unless !ENV['RAILS_LOG']
 +
 +config.cache_store = :file_store, ENV['RAILS_CACHE']
 +
 +# Set Active Record's database.yml path
-+config.database_configuration_file = File.join(ENV['RAILS_ETC'], 'database.yml') unless !ENV['RAILS_ETC']
-+
- # Make sure there's no plugin in vendor/plugin before starting
- vendor_plugins_dir = File.join(Rails.root, "vendor", "plugins")
- if Dir.glob(File.join(vendor_plugins_dir, "*")).any?
++config.paths['config/database'] = File.join(ENV['RAILS_ETC'], 'database.yml') unless !ENV['RAILS_ETC']

-- 
redmine.git