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

[Jérémy Lal]

Author: kapouer-guest
Date: 2009-09-24 12:54:48 +0000 (Thu, 24 Sep 2009)
New Revision: 4203

Modified:
   trunk/redmine/debian/README.Debian
   trunk/redmine/debian/README.source
   trunk/redmine/debian/config
   trunk/redmine/debian/postinst
Log:
Corrections (thanks, Jan Wagner);
* add explanations about recommended packages for ruby, apache
* clarify how to download the wiki in README.source
* dbconfig MySQL scripts do not like dbname with hyphen in it, so
it's replaced with an underscore.

Modified: trunk/redmine/debian/README.Debian
===================================================================
--- trunk/redmine/debian/README.Debian	2009-09-24 06:28:49 UTC (rev 4202)
+++ trunk/redmine/debian/README.Debian	2009-09-24 12:54:48 UTC (rev 4203)
@@ -1,35 +1,44 @@
 redmine for Debian
 ------------------
 
-This redmine package is designed to automatically configure database
-BUT NOT the web server.
-A debconf facility is provided to be able to configure several redmine
-instances. Use dpkg-reconfigure to define the instances identifiers.
+* SUPPORTS SETUP AND UPGRADES OF MULTIPLE DATABASE INSTANCES
+ This redmine package is designed to automatically configure database
+ BUT NOT the web server.
+ A debconf facility is provided to be able to configure several redmine
+ instances. Use dpkg-reconfigure to define the instances identifiers.
 
-Note for users of previous, unreleased redmine debian packages :
-the old configuration is moved to the "default" instance.
+* SUPPORTS MIGRATION FROM THE VERSION ON DEBIAN MENTORS
+ Note for users of previous, unreleased redmine debian packages :
+ the old configuration is moved to the "default" instance.
 
-By default, redmine admin account log/pass is admin/admin
+* REMEMBER TO CHANGE THE DEFAULT ADMIN PASSWORD
+ By default, redmine admin account log/pass is admin/admin
 
-For web server configuration, examples are
-available in /usr/share/doc/redmine/examples
+* MANUAL WEB SERVER CONFIGURATION
+ For web server configuration, examples are
+ available in /usr/share/doc/redmine/examples
+ To choose which instance to run, set the environment variable :
+ X_DEBIAN_SITEID=<instancename>
+ By default, 
+ X_DEBIAN_SITEID=default
 
-Please note that provided apache2 configuration examples are meant to be
-used with "rewrite" and "fcgid" modules. The "fastcgi" module is bound to
-be deprecated, since 
-"mod_fcgid is now included in Apache httpd 2.3 source code", see
-http://fastcgi.coremail.cn/
+ If used with apache2, lighttpd and similar web servers,
+ it is HIGHLY RECOMMENDED to install libfcgi-ruby,
+ and when using apache2, libapache2-mod-fcgid.
 
-To choose which instance to run, set the environment variable :
-X_DEBIAN_SITEID=<instancename>
-By default, 
-X_DEBIAN_SITEID=default
+ Please note that provided apache2 configuration examples are meant to be
+ used with "rewrite" and "fcgid" modules. The "fastcgi" module is bound to
+ be deprecated, since 
+ "mod_fcgid is now included in Apache httpd 2.3 source code", see
+ http://fastcgi.coremail.cn/
 
-To test redmine without installing a web server, run as root :
-cd /usr/share/redmine/
-sudo -u www-data X_DEBIAN_SITEID="default" ruby script/server webrick -e production
-and point your browser to http://localhost:3000
+* QUICK LAUNCH USING WEBRICK
+ To test redmine without installing a web server, run as root :
+ cd /usr/share/redmine/
+ sudo -u www-data X_DEBIAN_SITEID="default" ruby script/server webrick -e production
+ and point your browser to http://localhost:3000
 
+* MANUAL EMAIL CONFIGURATION
 Email settings are not automatically configured, for a quick setup, copy
 /usr/share/doc/redmine/examples/email.yml
 to

Modified: trunk/redmine/debian/README.source
===================================================================
--- trunk/redmine/debian/README.source	2009-09-24 06:28:49 UTC (rev 4202)
+++ trunk/redmine/debian/README.source	2009-09-24 12:54:48 UTC (rev 4203)
@@ -19,8 +19,9 @@
   * to get a "pristine" svn tar package :
     ./debian/rules get-orig-source
   * at this point uupdate won't help, so just extract the tar package and copy debian/ in it.
-  * get the latest wiki from http://www.redmine.org/projects/redmine/wiki/export?format=html,
-  the link is at the bottom of the "Index by title" page.
+  * the doc/wiki.html also will probably need to be updated : one can get it directly here:
+    http://www.redmine.org/projects/redmine/wiki/export?format=html
+	or by clicking the "HTML" link at the bottom of the "Index by title" page, in the redmine.org wiki.
 
 Then build the package :
 	cd redmine-0.9.0~svnxxxx/

Modified: trunk/redmine/debian/config
===================================================================
--- trunk/redmine/debian/config	2009-09-24 06:28:49 UTC (rev 4202)
+++ trunk/redmine/debian/config	2009-09-24 12:54:48 UTC (rev 4203)
@@ -122,7 +122,7 @@
 				if [ $fCode -eq 0 -a -n "$RET" ]; then
 					dbc_dbname="$RET"
 				else
-					dbc_dbname=redmine-$fInstance
+					dbc_dbname=redmine_$fInstance
 				fi
 				fCode=0
 				db_get redmine/instances/$fInstance/db/basepath || fCode=$?

Modified: trunk/redmine/debian/postinst
===================================================================
--- trunk/redmine/debian/postinst	2009-09-24 06:28:49 UTC (rev 4202)
+++ trunk/redmine/debian/postinst	2009-09-24 12:54:48 UTC (rev 4203)
@@ -123,7 +123,7 @@
 		if [ $fCode -eq 0 -a -n "$RET" ]; then
 			dbc_dbname="$RET"
 		else
-			dbc_dbname=redmine-$lInstance
+			dbc_dbname=redmine_$lInstance
 		fi
 		fCode=0
 		db_get redmine/instances/$lInstance/db/basepath || fCode=$?