[DRE-commits] r4220 - trunk/redmine/debian

[Jérémy Lal]

Author: kapouer-guest
Date: 2009-10-05 00:07:31 +0000 (Mon, 05 Oct 2009)
New Revision: 4220

Modified:
   trunk/redmine/debian/postinst
Log:
Move initialization of session_store outside of instance loop, since it's independent of instance.

Modified: trunk/redmine/debian/postinst
===================================================================
--- trunk/redmine/debian/postinst	2009-10-05 00:07:23 UTC (rev 4219)
+++ trunk/redmine/debian/postinst	2009-10-05 00:07:31 UTC (rev 4220)
@@ -36,6 +36,7 @@
 
 . /usr/share/dbconfig-common/dpkg/postinst
 
+fRailsEnv=production
 fRailsLog=/var/log/redmine
 fRailsVar=/var/lib/redmine
 fRailsCache=/var/cache/redmine
@@ -80,6 +81,11 @@
 			mkdir tmp
 		fi
 		chown -fR www-data:www-data tmp
+		# add secret key, set permissions
+		rake -s config/initializers/session_store.rb RAILS_ENV=$fRailsEnv || true
+		chown -f www-data:www-data config/initializers/session_store.rb
+		chmod 640 config/initializers/session_store.rb
+		
 		cd $savedir
 	;;
 
@@ -95,7 +101,6 @@
 db_get redmine/current-instances || true
 gInstances="${RET}"
 for lInstance in $gInstances; do
-	fRailsEnv=production
 	fRailsEtc=/etc/redmine/$lInstance
 	fRailsLog=/var/log/redmine/$lInstance
 	fRailsVar=/var/lib/redmine/$lInstance
@@ -175,7 +180,6 @@
 				# handle rake install
 				rake -s db:migrate RAILS_ENV=$fRailsEnv X_DEBIAN_SITEID="${lInstance}" VERBOSE=$RAKE_VERBOSE || true
 				rake -s redmine:load_default_data RAILS_ENV=$fRailsEnv X_DEBIAN_SITEID="${lInstance}" REDMINE_LANG=$DEFAULT_LANGUAGE || true
-				rake -s config/initializers/session_store.rb RAILS_ENV=$fRailsEnv X_DEBIAN_SITEID="${lInstance}" || true
 				# because rake task is executed as root here, and this file is used later by web server, make sure owner is www-data
 				chown -f www-data:www-data ${fRailsLog}/production.log
 			else