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

[Jérémy Lal]

Author: kapouer-guest
Date: 2010-06-29 05:20:26 +0000 (Tue, 29 Jun 2010)
New Revision: 5653

Modified:
   trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch
Log:
Upstream update to 0.9.5, refreshed patch.

Modified: trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch
===================================================================
--- trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch	2010-06-28 18:52:16 UTC (rev 5652)
+++ trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch	2010-06-29 05:20:26 UTC (rev 5653)
@@ -50,14 +50,22 @@
  # and should not be made visible to public.
  # If you have a load-balancing Redmine cluster, you will need to use the
  # same version of this file on each machine. And be sure to restart your
-@@ -15,13 +18,18 @@
+@@ -15,20 +18,19 @@
  # change this key, all old sessions will become invalid! Make sure the
  # secret is at least 30 characters and all random, no regular words or
  # you'll be exposed to dictionary attacks.
 -ActionController::Base.session = {
 -  :session_key => '_redmine_session',
+-  #
+-  # Uncomment and edit the :session_path below if are hosting your Redmine
+-  # at a suburi and don't want the top level path to access the cookies
+-  #
+-  # See: http://www.redmine.org/issues/3968
+-  #
+-  # :session_path => '/url_path_to/your/redmine/',
 -  :secret => '#{secret}'
 -}
++
 +production:
 +  key: _redmine_#{ENV['X_DEBIAN_SITEID']}
 +  secret: #{secret}
@@ -71,9 +79,8 @@
 +  secret: #{secret}
 +
  EOF
--  end
+   end
  end
 -
 -desc 'Generates a configuration file for cookie store sessions.'
 -task :generate_session_store => ['config/initializers/session_store.rb']
-+end