[DRE-commits] r5429 - in trunk/redmine/debian: . patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2010-05-27 00:26:37 +0000 (Thu, 27 May 2010)
New Revision: 5429

Modified:
   trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch
   trunk/redmine/debian/postinst
Log:
Session config keys are renamed.

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-05-27 00:26:25 UTC (rev 5428)
+++ trunk/redmine/debian/patches/0014-Move-session-configuration-to-YML-file-next-to-datab.patch	2010-05-27 00:26:37 UTC (rev 5429)
@@ -19,9 +19,9 @@
 +require 'action_controller'
 +relativeUrlRoot = ENV['RAILS_RELATIVE_URL_ROOT']
 +ActionController::Base.session = {
-+  :session_key => sessionconfig[Rails.env]['session_key'],
++  :key => sessionconfig[Rails.env]['key'],
 +  :secret => sessionconfig[Rails.env]['secret'],
-+  :session_path => (relativeUrlRoot.nil? or relativeUrlRoot.empty?) ? '/' : relativeUrlRoot
++  :path => (relativeUrlRoot.nil? or relativeUrlRoot.empty?) ? '/' : relativeUrlRoot
 +}
 +
  # Load Engine plugin if available
@@ -59,15 +59,15 @@
 -  :secret => '#{secret}'
 -}
 +production:
-+  session_key: _redmine_#{ENV['X_DEBIAN_SITEID']}
++  key: _redmine_#{ENV['X_DEBIAN_SITEID']}
 +  secret: #{secret}
 +
 +development:
-+  session_key: _redmine_#{ENV['X_DEBIAN_SITEID']}
++  key: _redmine_#{ENV['X_DEBIAN_SITEID']}
 +  secret: #{secret}
 +
 +test:
-+  session_key: _redmine_#{ENV['X_DEBIAN_SITEID']}
++  key: _redmine_#{ENV['X_DEBIAN_SITEID']}
 +  secret: #{secret}
 +
  EOF

Modified: trunk/redmine/debian/postinst
===================================================================
--- trunk/redmine/debian/postinst	2010-05-27 00:26:25 UTC (rev 5428)
+++ trunk/redmine/debian/postinst	2010-05-27 00:26:37 UTC (rev 5429)
@@ -212,6 +212,16 @@
 				rm ${fRailsEtc}/session.yml.new
 				# move old session_store.rb
 				echo "A new secret session key has been generated in ${fRailsEtc}/session.yml"
+			else
+				fHasOldSessionName=$(fgrep -c session_key "${fRailsEtc}/session.yml" || true)
+				if [ $fHasOldSessionName -gt 0 ]; then
+					cp ${fRailsEtc}/session.yml ${fRailsEtc}/session.yml.new
+					sed -i -r -e 's/session_key/key/g' ${fRailsEtc}/session.yml.new
+					chown -f root:www-data ${fRailsEtc}/session.yml.new
+					chmod 640 ${fRailsEtc}/session.yml.new
+					ucf --debconf-ok ${fRailsEtc}/session.yml.new ${fRailsEtc}/session.yml
+					rm ${fRailsEtc}/session.yml.new			
+				fi
 			fi
 			if [ -f config/initializers/session_store.rb ]; then
 				mv config/initializers/session_store.rb config/initializers/session_store.rb.dpkg-old