[DRE-commits] r3811 - packages-wip/redmine/trunk/debian/patches
Jérémy Lal
kapouer-guest at alioth.debian.org
Mon Jul 20 11:01:38 UTC 2009
Author: kapouer-guest
Date: 2009-07-20 11:01:37 +0000 (Mon, 20 Jul 2009)
New Revision: 3811
Added:
packages-wip/redmine/trunk/debian/patches/01_paths.patch
Removed:
packages-wip/redmine/trunk/debian/patches/01-paths.patch
Modified:
packages-wip/redmine/trunk/debian/patches/series
Log:
Oops, rename patch.
Deleted: packages-wip/redmine/trunk/debian/patches/01-paths.patch
===================================================================
--- packages-wip/redmine/trunk/debian/patches/01-paths.patch 2009-07-20 11:01:31 UTC (rev 3810)
+++ packages-wip/redmine/trunk/debian/patches/01-paths.patch 2009-07-20 11:01:37 UTC (rev 3811)
@@ -1,84 +0,0 @@
-Allows path configuration through environment variables RAILS_LOG, RAILS_VAR, RAILS_ETC, RAILS_CACHE
-
-diff -Nur redmine-0.9.0/app/models/attachment.rb redmine-0.9.0.new/app/models/attachment.rb
---- redmine-0.9.0/app/models/attachment.rb 2009-04-25 11:31:36.000000000 +0200
-+++ redmine-0.9.0.new/app/models/attachment.rb 2009-07-20 10:10:20.577250208 +0200
-@@ -43,7 +43,7 @@
- "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
-
- cattr_accessor :storage_path
-- @@storage_path = "#{RAILS_ROOT}/files"
-+ @@storage_path = ENV['RAILS_VAR'] ? File.join(ENV['RAILS_VAR'], 'files') : "#{RAILS_ROOT}/files"
-
- def validate
- if self.filesize > Setting.attachment_max_size.to_i.kilobytes
-diff -Nur redmine-0.9.0/config/environment.rb redmine-0.9.0.new/config/environment.rb
---- redmine-0.9.0/config/environment.rb 2009-05-17 11:55:13.000000000 +0200
-+++ redmine-0.9.0.new/config/environment.rb 2009-07-20 10:03:30.529220583 +0200
-@@ -2,7 +2,10 @@
-
- # Uncomment below to force Rails into production mode when
- # you don't control web/app server and can't set it the proper way
--# ENV['RAILS_ENV'] ||= 'production'
-+ENV['RAILS_ENV'] ||= 'production'
-+#not needed ENV['RAILS_LOG'] ||= '/var/log/redmine'
-+#not needed ENV['RAILS_ETC'] ||= '/etc/redmine'
-+ENV['RAILS_CACHE'] ||= "#{RAILS_ROOT}/cache"
-
- # Specifies gem version of Rails to use when vendor/rails is not present
- RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
-@@ -30,9 +33,18 @@
- # (by default production uses :info, the others :debug)
- # config.log_level = :debug
-
-+ # log path
-+ config.log_path = File.join(ENV['RAILS_LOG'], "#{ENV['RAILS_ENV']}.log") unless !ENV['RAILS_LOG']
-+
- # Enable page/fragment caching by setting a file-based store
- # (remember to create the caching directory and make it readable to the application)
- # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
-+
-+ # the file cache store
-+ 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']
-
- # Activate observers that should always be running
- # config.active_record.observers = :cacher, :garbage_collector
-diff -Nur redmine-0.9.0/config/initializers/10-patches.rb redmine-0.9.0.new/config/initializers/10-patches.rb
---- redmine-0.9.0/config/initializers/10-patches.rb 2009-02-22 15:46:32.000000000 +0100
-+++ redmine-0.9.0.new/config/initializers/10-patches.rb 2009-07-20 10:12:30.665222136 +0200
-@@ -78,3 +78,6 @@
- end
-
- ActionMailer::Base.send :include, AsynchronousMailer
-+
-+# the session store
-+ActionController::Base.session_options[:tmpdir] = File.join(ENV['RAILS_VAR'], 'sessions') unless !ENV['RAILS_VAR']
-diff -Nur redmine-0.9.0/config/initializers/40-email.rb redmine-0.9.0.new/config/initializers/40-email.rb
---- redmine-0.9.0/config/initializers/40-email.rb 2008-07-04 20:55:45.000000000 +0200
-+++ redmine-0.9.0.new/config/initializers/40-email.rb 2009-07-20 10:06:39.470459347 +0200
-@@ -1,7 +1,7 @@
- # Loads action_mailer settings from email.yml
- # and turns deliveries on if configuration file is found
-
--filename = File.join(File.dirname(__FILE__), '..', 'email.yml')
-+filename = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'email.yml') : File.join(File.dirname(__FILE__), '..', 'email.yml')
- if File.file?(filename)
- mailconfig = YAML::load_file(filename)
-
-diff -Nur redmine-0.9.0/public/dispatch.fcgi.example redmine-0.9.0.new/public/dispatch.fcgi.example
---- redmine-0.9.0/public/dispatch.fcgi.example 2008-11-11 14:54:10.000000000 +0100
-+++ redmine-0.9.0.new/public/dispatch.fcgi.example 2009-07-20 10:14:50.137220270 +0200
-@@ -20,5 +20,8 @@
- #
- require File.dirname(__FILE__) + "/../config/environment"
- require 'fcgi_handler'
--
--RailsFCGIHandler.process!
-+if ENV['RAILS_LOG']
-+ RailsFCGIHandler.process! File.join(ENV['RAILS_LOG], 'fastcgi.crash.log'), 20
-+else
-+ RailsFCGIHandler.process!
-+end
Copied: packages-wip/redmine/trunk/debian/patches/01_paths.patch (from rev 3810, packages-wip/redmine/trunk/debian/patches/01-paths.patch)
===================================================================
--- packages-wip/redmine/trunk/debian/patches/01_paths.patch (rev 0)
+++ packages-wip/redmine/trunk/debian/patches/01_paths.patch 2009-07-20 11:01:37 UTC (rev 3811)
@@ -0,0 +1,84 @@
+Allows path configuration through environment variables RAILS_LOG, RAILS_VAR, RAILS_ETC, RAILS_CACHE
+
+diff -Nur redmine-0.9.0/app/models/attachment.rb redmine-0.9.0.new/app/models/attachment.rb
+--- redmine-0.9.0/app/models/attachment.rb 2009-04-25 11:31:36.000000000 +0200
++++ redmine-0.9.0.new/app/models/attachment.rb 2009-07-20 10:10:20.577250208 +0200
+@@ -43,7 +43,7 @@
+ "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
+
+ cattr_accessor :storage_path
+- @@storage_path = "#{RAILS_ROOT}/files"
++ @@storage_path = ENV['RAILS_VAR'] ? File.join(ENV['RAILS_VAR'], 'files') : "#{RAILS_ROOT}/files"
+
+ def validate
+ if self.filesize > Setting.attachment_max_size.to_i.kilobytes
+diff -Nur redmine-0.9.0/config/environment.rb redmine-0.9.0.new/config/environment.rb
+--- redmine-0.9.0/config/environment.rb 2009-05-17 11:55:13.000000000 +0200
++++ redmine-0.9.0.new/config/environment.rb 2009-07-20 10:03:30.529220583 +0200
+@@ -2,7 +2,10 @@
+
+ # Uncomment below to force Rails into production mode when
+ # you don't control web/app server and can't set it the proper way
+-# ENV['RAILS_ENV'] ||= 'production'
++ENV['RAILS_ENV'] ||= 'production'
++#not needed ENV['RAILS_LOG'] ||= '/var/log/redmine'
++#not needed ENV['RAILS_ETC'] ||= '/etc/redmine'
++ENV['RAILS_CACHE'] ||= "#{RAILS_ROOT}/cache"
+
+ # Specifies gem version of Rails to use when vendor/rails is not present
+ RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
+@@ -30,9 +33,18 @@
+ # (by default production uses :info, the others :debug)
+ # config.log_level = :debug
+
++ # log path
++ config.log_path = File.join(ENV['RAILS_LOG'], "#{ENV['RAILS_ENV']}.log") unless !ENV['RAILS_LOG']
++
+ # Enable page/fragment caching by setting a file-based store
+ # (remember to create the caching directory and make it readable to the application)
+ # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
++
++ # the file cache store
++ 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']
+
+ # Activate observers that should always be running
+ # config.active_record.observers = :cacher, :garbage_collector
+diff -Nur redmine-0.9.0/config/initializers/10-patches.rb redmine-0.9.0.new/config/initializers/10-patches.rb
+--- redmine-0.9.0/config/initializers/10-patches.rb 2009-02-22 15:46:32.000000000 +0100
++++ redmine-0.9.0.new/config/initializers/10-patches.rb 2009-07-20 10:12:30.665222136 +0200
+@@ -78,3 +78,6 @@
+ end
+
+ ActionMailer::Base.send :include, AsynchronousMailer
++
++# the session store
++ActionController::Base.session_options[:tmpdir] = File.join(ENV['RAILS_VAR'], 'sessions') unless !ENV['RAILS_VAR']
+diff -Nur redmine-0.9.0/config/initializers/40-email.rb redmine-0.9.0.new/config/initializers/40-email.rb
+--- redmine-0.9.0/config/initializers/40-email.rb 2008-07-04 20:55:45.000000000 +0200
++++ redmine-0.9.0.new/config/initializers/40-email.rb 2009-07-20 10:06:39.470459347 +0200
+@@ -1,7 +1,7 @@
+ # Loads action_mailer settings from email.yml
+ # and turns deliveries on if configuration file is found
+
+-filename = File.join(File.dirname(__FILE__), '..', 'email.yml')
++filename = ENV['RAILS_ETC'] ? File.join(ENV['RAILS_ETC'], 'email.yml') : File.join(File.dirname(__FILE__), '..', 'email.yml')
+ if File.file?(filename)
+ mailconfig = YAML::load_file(filename)
+
+diff -Nur redmine-0.9.0/public/dispatch.fcgi.example redmine-0.9.0.new/public/dispatch.fcgi.example
+--- redmine-0.9.0/public/dispatch.fcgi.example 2008-11-11 14:54:10.000000000 +0100
++++ redmine-0.9.0.new/public/dispatch.fcgi.example 2009-07-20 10:14:50.137220270 +0200
+@@ -20,5 +20,8 @@
+ #
+ require File.dirname(__FILE__) + "/../config/environment"
+ require 'fcgi_handler'
+-
+-RailsFCGIHandler.process!
++if ENV['RAILS_LOG']
++ RailsFCGIHandler.process! File.join(ENV['RAILS_LOG], 'fastcgi.crash.log'), 20
++else
++ RailsFCGIHandler.process!
++end
Modified: packages-wip/redmine/trunk/debian/patches/series
===================================================================
--- packages-wip/redmine/trunk/debian/patches/series 2009-07-20 11:01:31 UTC (rev 3810)
+++ packages-wip/redmine/trunk/debian/patches/series 2009-07-20 11:01:37 UTC (rev 3811)
@@ -1 +1 @@
-01-paths.patch
+01_paths.patch
More information about the Pkg-ruby-extras-commits
mailing list