[DRE-commits] r4175 - in trunk/redmine/debian: . doc/examples
Jérémy Lal
kapouer-guest at alioth.debian.org
Sat Sep 19 14:17:55 UTC 2009
Author: kapouer-guest
Date: 2009-09-19 14:17:55 +0000 (Sat, 19 Sep 2009)
New Revision: 4175
Modified:
trunk/redmine/debian/README.Debian
trunk/redmine/debian/doc/examples/apache2-alias.conf
trunk/redmine/debian/doc/examples/apache2-host.conf
trunk/redmine/debian/doc/examples/lighttpd-host-alias.conf
trunk/redmine/debian/doc/examples/lighttpd-host.conf
trunk/redmine/debian/doc/examples/lighttpd-socket-alias.conf
trunk/redmine/debian/doc/examples/lighttpd-socket.conf
Log:
More explanations, improvements and corrections to examples config files.
Modified: trunk/redmine/debian/README.Debian
===================================================================
--- trunk/redmine/debian/README.Debian 2009-09-19 14:17:50 UTC (rev 4174)
+++ trunk/redmine/debian/README.Debian 2009-09-19 14:17:55 UTC (rev 4175)
@@ -11,6 +11,12 @@
For web server configuration, examples are
available in /usr/share/doc/redmine/examples
+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 choose which instance to run, set the environment variable :
X_DEBIAN_SITEID=<instancename>
By default,
Modified: trunk/redmine/debian/doc/examples/apache2-alias.conf
===================================================================
--- trunk/redmine/debian/doc/examples/apache2-alias.conf 2009-09-19 14:17:50 UTC (rev 4174)
+++ trunk/redmine/debian/doc/examples/apache2-alias.conf 2009-09-19 14:17:55 UTC (rev 4175)
@@ -1,3 +1,6 @@
+# These modules must be enabled : rewrite, fcgid
+# (mod_fastcgi is much harder to configure)
+# Configuration for http://localhost/redmine
<VirtualHost localhost>
# DefaultInitEnv for module mod_fcgid
DefaultInitEnv RAILS_RELATIVE_URL_ROOT "/redmine"
@@ -2,8 +5,6 @@
DefaultInitEnv X_DEBIAN_SITEID "default"
- # SetEnv for module mod_fastcgi
- # SetEnv RAILS_RELATIVE_URL_ROOT "/redmine"
- # SetEnv X_DEBIAN_SITEID "default"
- # the fcgid socket path
+ # the mod_fcgid socket path
SocketPath "/var/run/redmine/sockets/default"
+
Alias "/redmine" /usr/share/redmine/public
Modified: trunk/redmine/debian/doc/examples/apache2-host.conf
===================================================================
--- trunk/redmine/debian/doc/examples/apache2-host.conf 2009-09-19 14:17:50 UTC (rev 4174)
+++ trunk/redmine/debian/doc/examples/apache2-host.conf 2009-09-19 14:17:55 UTC (rev 4175)
@@ -1,17 +1,21 @@
-<VirtualHost localhost>
+# These modules must be enabled : rewrite, fcgid
+# (mod_fastcgi is much harder to configure)
+# Configuration for http://localhost:8080
+<VirtualHost *:8080>
# DefaultInitEnv for module mod_fcgid
+ DefaultInitEnv RAILS_RELATIVE_URL_ROOT ""
DefaultInitEnv X_DEBIAN_SITEID "default"
- # SetEnv for module mod_fastcgi
- # SetEnv X_DEBIAN_SITEID "default"
+
+ # the mod_fcgid socket path
+ SocketPath "/var/run/redmine/sockets/default"
- # the fcgid socket path
- SocketPath "/var/run/redmine/sockets/default"
DocumentRoot /usr/share/redmine/public
<Directory "/usr/share/redmine/public">
Options +FollowSymLinks +ExecCGI
Order allow,deny
Allow from all
RewriteEngine On
+ RewriteBase ""
RewriteRule ^$ index.html [QSA]
RewriteRule ^([^.]+)$ $1.html [QSA]
RewriteCond %{REQUEST_FILENAME} !-f [OR]
Modified: trunk/redmine/debian/doc/examples/lighttpd-host-alias.conf
===================================================================
--- trunk/redmine/debian/doc/examples/lighttpd-host-alias.conf 2009-09-19 14:17:50 UTC (rev 4174)
+++ trunk/redmine/debian/doc/examples/lighttpd-host-alias.conf 2009-09-19 14:17:55 UTC (rev 4175)
@@ -1,5 +1,6 @@
$HTTP["host"] =~ "^localhost$" {
$HTTP["url"] =~ "^/redmine(/|$)" {
+ var.X_DEBIAN_SITEID = "default"
server.document-root = "/usr/share/redmine/public/"
server.indexfiles = ( "dispatch.fcgi" )
server.error-handler-404 = "/redmine/dispatch.fcgi"
@@ -10,11 +11,11 @@
"min-procs" => 1,
# max-procs >= 2 for Upload Progress or other tasks that need a second parallel request
"max-procs" => 2,
- "socket" => "/var/run/redmine/sockets/default/fcgi.socket",
+ "socket" => "/var/run/redmine/sockets/" + var.X_DEBIAN_SITEID + "/fcgi.socket",
"bin-path" => "/usr/share/redmine/public/dispatch.fcgi",
"bin-environment" => (
"RAILS_RELATIVE_URL_ROOT" => "/redmine",
- "X_DEBIAN_SITEID" => "default"
+ "X_DEBIAN_SITEID" => var.X_DEBIAN_SITEID
),
"check-local" => "disable",
"kill-signal" => 10 # this is because programs linked against libfcgi need USR1 kill-signal
Modified: trunk/redmine/debian/doc/examples/lighttpd-host.conf
===================================================================
--- trunk/redmine/debian/doc/examples/lighttpd-host.conf 2009-09-19 14:17:50 UTC (rev 4174)
+++ trunk/redmine/debian/doc/examples/lighttpd-host.conf 2009-09-19 14:17:55 UTC (rev 4175)
@@ -1,4 +1,5 @@
$HTTP["host"] =~ "^localhost$" {
+ var.X_DEBIAN_SITEID = "default"
server.document-root = "/usr/share/redmine/public/"
server.indexfiles = ( "dispatch.fcgi" )
server.error-handler-404 = "/dispatch.fcgi"
@@ -9,10 +10,11 @@
"min-procs" => 1,
# max-procs >= 2 for Upload Progress or other tasks that need a second parallel request
"max-procs" => 2,
- "socket" => "/var/run/redmine/sockets/default/fcgi.socket",
+ "socket" => "/var/run/redmine/sockets/" + var.X_DEBIAN_SITEID + "/fcgi.socket",
"bin-path" => "/usr/share/redmine/public/dispatch.fcgi",
"bin-environment" => (
- "X_DEBIAN_SITEID" => "default"
+ "RAILS_RELATIVE_URL_ROOT" => "",
+ "X_DEBIAN_SITEID" => var.X_DEBIAN_SITEID
),
"kill-signal" => 10 # this is because programs linked against libfcgi need USR1 kill-signal
)
Modified: trunk/redmine/debian/doc/examples/lighttpd-socket-alias.conf
===================================================================
--- trunk/redmine/debian/doc/examples/lighttpd-socket-alias.conf 2009-09-19 14:17:50 UTC (rev 4174)
+++ trunk/redmine/debian/doc/examples/lighttpd-socket-alias.conf 2009-09-19 14:17:55 UTC (rev 4175)
@@ -1,5 +1,6 @@
$SERVER["socket"] == "localhost:8080" {
$HTTP["url"] =~ "^/redmine(/|$)" {
+ var.X_DEBIAN_SITEID = "default"
server.document-root = "/usr/share/redmine/public/"
server.indexfiles = ( "dispatch.fcgi" )
server.error-handler-404 = "/redmine/dispatch.fcgi"
@@ -10,11 +11,11 @@
"min-procs" => 1,
# max-procs >= 2 for Upload Progress or other tasks that need a second parallel request
"max-procs" => 2,
- "socket" => "/var/run/redmine/sockets/default/fcgi.socket",
+ "socket" => "/var/run/redmine/sockets/" + var.X_DEBIAN_SITEID + "/fcgi.socket",
"bin-path" => "/usr/share/redmine/public/dispatch.fcgi",
"bin-environment" => (
"RAILS_RELATIVE_URL_ROOT" => "/redmine",
- "X_DEBIAN_SITEID" => "default"
+ "X_DEBIAN_SITEID" => var.X_DEBIAN_SITEID
),
"check-local" => "disable",
"kill-signal" => 10 # this is because programs linked against libfcgi need USR1 kill-signal
Modified: trunk/redmine/debian/doc/examples/lighttpd-socket.conf
===================================================================
--- trunk/redmine/debian/doc/examples/lighttpd-socket.conf 2009-09-19 14:17:50 UTC (rev 4174)
+++ trunk/redmine/debian/doc/examples/lighttpd-socket.conf 2009-09-19 14:17:55 UTC (rev 4175)
@@ -1,4 +1,5 @@
$SERVER["socket"] == "localhost:8080" {
+ var.X_DEBIAN_SITEID = "default"
server.document-root = "/usr/share/redmine/public/"
server.indexfiles = ( "dispatch.fcgi" )
server.error-handler-404 = "/dispatch.fcgi"
@@ -9,10 +10,11 @@
"min-procs" => 1,
# max-procs >= 2 for Upload Progress or other tasks that need a second parallel request
"max-procs" => 2,
- "socket" => "/var/run/redmine/sockets/default/fcgi.socket",
+ "socket" => "/var/run/redmine/sockets/" + var.X_DEBIAN_SITEID + "/fcgi.socket",
"bin-path" => "/usr/share/redmine/public/dispatch.fcgi",
"bin-environment" => (
- "X_DEBIAN_SITEID" => "default"
+ "RAILS_RELATIVE_URL_ROOT" => "",
+ "X_DEBIAN_SITEID" => var.X_DEBIAN_SITEID
),
"kill-signal" => 10 # this is because programs linked against libfcgi need USR1 kill-signal
)
More information about the Pkg-ruby-extras-commits
mailing list