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

[Jérémy Lal]

Author: kapouer-guest
Date: 2009-10-05 00:06:48 +0000 (Mon, 05 Oct 2009)
New Revision: 4215

Removed:
   trunk/redmine/debian/patches/02_session_store.patch
Modified:
   trunk/redmine/debian/patches/series
   trunk/redmine/debian/postinst
Log:
Instead of using rake, include the db migration file for creating sessions,
and use the patch file for this.

Deleted: trunk/redmine/debian/patches/02_session_store.patch
===================================================================
--- trunk/redmine/debian/patches/02_session_store.patch	2009-10-05 00:06:34 UTC (rev 4214)
+++ trunk/redmine/debian/patches/02_session_store.patch	2009-10-05 00:06:48 UTC (rev 4215)
@@ -1,16 +0,0 @@
-diff -Nur redmine-0.9.0~svn2902/config/environment.rb redmine-0.9.0~svn2902.new/config/environment.rb
---- redmine-0.9.0~svn2902/config/environment.rb	2009-10-01 12:16:04.845300651 +0200
-+++ redmine-0.9.0~svn2902.new/config/environment.rb	2009-10-03 17:33:13.211312450 +0200
-@@ -40,6 +40,12 @@
- 
-   # Make Active Record use UTC-base instead of local time
-   # config.active_record.default_timezone = :utc
-+
-+  # Use the database for sessions instead of the cookie-based default,
-+  # which shouldn't be used to store highly confidential information
-+  # (create the session table with "rake db:sessions:create")
-+  config.action_controller.session_store = :active_record_store
-+
-   
-   # Use Active Record's schema dumper instead of SQL when creating the test database
-   # (enables use of different database adapters for development and test environments)

Modified: trunk/redmine/debian/patches/series
===================================================================
--- trunk/redmine/debian/patches/series	2009-10-05 00:06:34 UTC (rev 4214)
+++ trunk/redmine/debian/patches/series	2009-10-05 00:06:48 UTC (rev 4215)
@@ -1,3 +1,3 @@
 changeset_r2886_r2887.diff
 01_paths.patch
-02_session_store.patch
+02_sessions_store_active_record.patch

Modified: trunk/redmine/debian/postinst
===================================================================
--- trunk/redmine/debian/postinst	2009-10-05 00:06:34 UTC (rev 4214)
+++ trunk/redmine/debian/postinst	2009-10-05 00:06:48 UTC (rev 4215)
@@ -172,8 +172,6 @@
 			cd /usr/share/redmine
 			if [ $withdb -eq 1 ]; then
 				db_get redmine/instances/${lInstance}/default-language && DEFAULT_LANGUAGE="$RET"
-				# store sessions in database, more secure and fixes #549453
-				rake -s db:sessions:create RAILS_ENV=$fRailsEnv X_DEBIAN_SITEID="${lInstance}" VERBOSE=$RAKE_VERBOSE || true
 				# 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