| 1 |
bangert 09/04/03 18:18:13 |
| 2 |
|
| 3 |
Modified: spawn-fcgi.initd spawn-fcgi.confd |
| 4 |
Log: |
| 5 |
improve documentation in conf.d - use a different exec approach in init.d |
| 6 |
(Portage version: 2.2_rc26/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 www-servers/spawn-fcgi/files/spawn-fcgi.initd |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: spawn-fcgi.initd |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- spawn-fcgi.initd 1 Apr 2009 10:12:17 -0000 1.1 |
| 22 |
+++ spawn-fcgi.initd 3 Apr 2009 18:18:13 -0000 1.2 |
| 23 |
@@ -1,7 +1,7 @@ |
| 24 |
#!/sbin/runscript |
| 25 |
# Copyright 1999-2009 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.1 2009/04/01 10:12:17 bangert Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.2 2009/04/03 18:18:13 bangert Exp $ |
| 29 |
|
| 30 |
PROGNAME=${SVCNAME/spawn\-fcgi./} |
| 31 |
SPAWNFCGI=/usr/bin/spawn-fcgi |
| 32 |
@@ -26,7 +26,7 @@ |
| 33 |
fi |
| 34 |
|
| 35 |
if [[ ! -z "${FCGI_SOCKET}" ]] && [[ ! -z "${FCGI_PORT}" ]]; then |
| 36 |
- eerror "Only one of both must be defined:" |
| 37 |
+ eerror "Only one of the two may be defined:" |
| 38 |
eerror " FCGI_SOCKET=${FCGI_SOCKET}" |
| 39 |
eerror " FCGI_PORT=${FCGI_PORT}" |
| 40 |
return 1 |
| 41 |
@@ -70,10 +70,10 @@ |
| 42 |
local P |
| 43 |
P=${PIDFILE}-${X}.pid |
| 44 |
[[ -n "${FCGI_SOCKET}" ]] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}" |
| 45 |
- [[ -n "${FCGI_PORT}" ]] && PORT_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))" |
| 46 |
+ [[ -n "${FCGI_PORT}" ]] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))" |
| 47 |
|
| 48 |
start-stop-daemon --start --pidfile ${P} ${E} --exec ${SPAWNFCGI} -- \ |
| 49 |
- ${SOCKET_OPTION} ${PORT_OPTION} -f ${FCGI_PROGRAM} -P ${P} ${OPTIONS} |
| 50 |
+ ${SOCKET_OPTION} ${INET_OPTION} -P ${P} ${OPTIONS} -- ${FCGI_PROGRAM} |
| 51 |
RETVAL=$? |
| 52 |
|
| 53 |
# Stop on error. Don't want to spawn a mess! |
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.2 www-servers/spawn-fcgi/files/spawn-fcgi.confd |
| 58 |
|
| 59 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd?rev=1.2&view=markup |
| 60 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd?rev=1.2&content-type=text/plain |
| 61 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd?r1=1.1&r2=1.2 |
| 62 |
|
| 63 |
Index: spawn-fcgi.confd |
| 64 |
=================================================================== |
| 65 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v |
| 66 |
retrieving revision 1.1 |
| 67 |
retrieving revision 1.2 |
| 68 |
diff -u -r1.1 -r1.2 |
| 69 |
--- spawn-fcgi.confd 1 Apr 2009 10:12:17 -0000 1.1 |
| 70 |
+++ spawn-fcgi.confd 3 Apr 2009 18:18:13 -0000 1.2 |
| 71 |
@@ -1,23 +1,32 @@ |
| 72 |
# Copyright 1999-2009 Gentoo Foundation |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v 1.1 2009/04/01 10:12:17 bangert Exp $ |
| 75 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v 1.2 2009/04/03 18:18:13 bangert Exp $ |
| 76 |
|
| 77 |
# DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD! |
| 78 |
|
| 79 |
-# One of the following options must be enabled. The filename specified by |
| 80 |
+# The FCGI process can be made available through a filesystem socket or |
| 81 |
+# through a inet socket. One and only one of the two types must be choosen. |
| 82 |
+# Default is the inet socket. |
| 83 |
+ |
| 84 |
+# The filename specified by |
| 85 |
# FCGI_SOCKET will be suffixed with a number for each child process, for |
| 86 |
-# example, fcgi.socket-1. The port specified by FCGI_PORT is the port used |
| 87 |
-# by the first child process. If this is set to 1234 then subsequent child |
| 88 |
-# processes will use 1235, 1236, etc. |
| 89 |
-# |
| 90 |
+# example, fcgi.socket-1. |
| 91 |
+# Leave empty to use an IP socket (default). See below. Enabling this, |
| 92 |
+# disables the IP socket. |
| 93 |
+# |
| 94 |
FCGI_SOCKET= |
| 95 |
-FCGI_PORT=1234 |
| 96 |
|
| 97 |
# When using FCGI_PORT, connections will only be accepted from the following |
| 98 |
# address. The default is 127.0.0.1. Use 0.0.0.0 to bind to all addresses. |
| 99 |
# |
| 100 |
FCGI_ADDRESS=127.0.0.1 |
| 101 |
|
| 102 |
+# The port specified by FCGI_PORT is the port used |
| 103 |
+# by the first child process. If this is set to 1234 then subsequent child |
| 104 |
+# processes will use 1235, 1236, etc. |
| 105 |
+# |
| 106 |
+FCGI_PORT=1234 |
| 107 |
+ |
| 108 |
# The path to your FastCGI application. These sometimes carry the .fcgi |
| 109 |
# extension but not always. For PHP, you should usually point this to |
| 110 |
# /usr/bin/php-cgi. |
| 111 |
@@ -50,5 +59,5 @@ |
| 112 |
# of child processes to spawn. The second is the number of requests to be |
| 113 |
# served by a single PHP process before it is restarted. |
| 114 |
# |
| 115 |
-PHP_FCGI_CHILDREN=5 |
| 116 |
-PHP_FCGI_MAX_REQUESTS=500 |
| 117 |
+#PHP_FCGI_CHILDREN=5 |
| 118 |
+#PHP_FCGI_MAX_REQUESTS=500 |
Archives