[DRE-commits] [SCM] redmine.git branch, master, updated. debian/1.1.3-1-8-g28e30e3

[Jérémy Lal]

The following commit has been merged in the master branch:
commit 1a9e80f40a5f8fc4b08a8232b5c155cbd31624f8
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue Jul 5 21:58:03 2011 +0200

    Replace /var/run/redmine with /tmp in doc configuration examples.

diff --git a/debian/doc/examples/lighttpd-host-alias.conf b/debian/doc/examples/lighttpd-host-alias.conf
index 9bf5eed..739a421 100644
--- a/debian/doc/examples/lighttpd-host-alias.conf
+++ b/debian/doc/examples/lighttpd-host-alias.conf
@@ -14,7 +14,7 @@ $HTTP["host"] =~ "^localhost$" {
 					"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/" + var.X_DEBIAN_SITEID + "/fcgi.socket",
+					"socket"          => "/tmp/redmine-" + var.X_DEBIAN_SITEID + "-fcgi.socket",
 					"bin-path"        => "/usr/share/redmine/public/dispatch.fcgi",
 					"bin-environment" => (
 						"RAILS_RELATIVE_URL_ROOT" => "/redmine",
diff --git a/debian/doc/examples/lighttpd-host.conf b/debian/doc/examples/lighttpd-host.conf
index b32d991..f1ca822 100644
--- a/debian/doc/examples/lighttpd-host.conf
+++ b/debian/doc/examples/lighttpd-host.conf
@@ -13,7 +13,7 @@ $HTTP["host"] =~ "^localhost$" {
 				"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/" + var.X_DEBIAN_SITEID + "/fcgi.socket",
+				"socket"          => "/tmp/redmine-" + var.X_DEBIAN_SITEID + "-fcgi.socket",
 				"bin-path"        => "/usr/share/redmine/public/dispatch.fcgi",
 				"bin-environment" => (
 					"RAILS_RELATIVE_URL_ROOT" => "",
diff --git a/debian/doc/examples/lighttpd-socket-alias.conf b/debian/doc/examples/lighttpd-socket-alias.conf
index 1357d98..7d73308 100644
--- a/debian/doc/examples/lighttpd-socket-alias.conf
+++ b/debian/doc/examples/lighttpd-socket-alias.conf
@@ -14,7 +14,7 @@ $SERVER["socket"] == "localhost:8080" {
 					"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/" + var.X_DEBIAN_SITEID + "/fcgi.socket",
+					"socket"          => "/tmp/redmine-" + var.X_DEBIAN_SITEID + "-fcgi.socket",
 					"bin-path"        => "/usr/share/redmine/public/dispatch.fcgi",
 					"bin-environment" => (
 						"RAILS_RELATIVE_URL_ROOT" => "/redmine",
diff --git a/debian/doc/examples/lighttpd-socket.conf b/debian/doc/examples/lighttpd-socket.conf
index 4128850..8d9a2a5 100644
--- a/debian/doc/examples/lighttpd-socket.conf
+++ b/debian/doc/examples/lighttpd-socket.conf
@@ -13,7 +13,7 @@ $SERVER["socket"] == "localhost:8080" {
 				"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/" + var.X_DEBIAN_SITEID + "/fcgi.socket",
+				"socket"          => "/tmp/redmine-" + var.X_DEBIAN_SITEID + "-fcgi.socket",
 				"bin-path"        => "/usr/share/redmine/public/dispatch.fcgi",
 				"bin-environment" => (
 					"RAILS_RELATIVE_URL_ROOT" => "",
diff --git a/debian/doc/examples/run-redmine-fcgi b/debian/doc/examples/run-redmine-fcgi
index 4b51f69..6d12d6b 100644
--- a/debian/doc/examples/run-redmine-fcgi
+++ b/debian/doc/examples/run-redmine-fcgi
@@ -10,6 +10,6 @@ exec 2>&1
 RAILS_RELATIVE_URL_ROOT="/redmine" \
 X_DEBIAN_SITEID="default" \
 RAILS_ENV="production" \
-exec /usr/bin/spawn-fcgi -n -s /var/run/redmine/sockets/default/fcgi.socket \
--u www-data -- \
+exec /usr/bin/spawn-fcgi -n -s /tmp/redmine-default-fcgi.socket \
+-M 640 -u www-data -- \
 /usr/bin/multiwatch -f 2 /usr/share/redmine/public/dispatch.fcgi
diff --git a/debian/doc/examples/thin-redmine.yml b/debian/doc/examples/thin-redmine.yml
index 795d247..459dbde 100644
--- a/debian/doc/examples/thin-redmine.yml
+++ b/debian/doc/examples/thin-redmine.yml
@@ -6,11 +6,11 @@ group: www-data
 
 # parameters that depend on the redmine instance
 x_debian_siteid: default
-pid: /var/run/redmine/sockets/default/thin-1.pid
+pid: /tmp/redmine-default-thin-1.pid
 log: /var/log/redmine/default/thin.log
 port: 3000
 # might use a unix socket instead :
-# socket: /var/run/redmine/sockets/default/thin-1.socket
+# socket: /tmp/redmine-default-thin-1.socket
 
 # read http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=602077 before using this
 # servers: 2

-- 
redmine.git