improve documentation in conf.d - use a different exec approach in init.d

Package-Manager: portage-2.2_rc26/cvs/Linux i686

4 files changed, 30 insertions, 17 deletions

diff --git a/www-servers/spawn-fcgi/ChangeLog b/www-servers/spawn-fcgi/ChangeLog
index 34eef90bee14..79c631cadb55 100644
--- a/www-servers/spawn-fcgi/ChangeLog
+++ b/www-servers/spawn-fcgi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/spawn-fcgi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/ChangeLog,v 1.1 2009/04/01 10:12:17 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/ChangeLog,v 1.2 2009/04/03 18:18:12 bangert Exp $
+
+  03 Apr 2009; Thilo Bangert <bangert@gentoo.org> files/spawn-fcgi.confd,
+  files/spawn-fcgi.initd:
+  improve documentation in conf.d - use a different exec approach in init.d
 
 *spawn-fcgi-1.6.1 (01 Apr 2009)
 
diff --git a/www-servers/spawn-fcgi/Manifest b/www-servers/spawn-fcgi/Manifest
index 8916d997dbae..cbcf5152968f 100644
--- a/www-servers/spawn-fcgi/Manifest
+++ b/www-servers/spawn-fcgi/Manifest
@@ -1,6 +1,6 @@
-AUX spawn-fcgi.confd 1971 RMD160 6559f640adbacca42e7b6d508d4b891f978fa8a4 SHA1 22e6322420a2b162de7a9f8f193bf4e16c4b354f SHA256 f65e4051f07b5fd1c8bd5eddb5d1a69eee8fb29d4a29227372c85212bccc06fc
-AUX spawn-fcgi.initd 2654 RMD160 a24a0d6bc008a8131214a00195b1da5261c0309b SHA1 4edc2538e654905187cb4f895504fe601bbb5f84 SHA256 f8858ba2f76d7b093f14a58e7d2356051c410e23c1648ac0af061e5548809394
+AUX spawn-fcgi.confd 2211 RMD160 a6f7f778fbe5eab7702a407c9761f537ecb43f83 SHA1 8c8eb892c06aedb3641d7bef692a24200df02f23 SHA256 4a5ce40facaea8bebdc519787111b32a24df82d313079a8e882d599ab4d2b344
+AUX spawn-fcgi.initd 2656 RMD160 307a9c095375716c212157ff93cb49dd6cfae5f8 SHA1 852ee22ff8cfb2e77fda1526ef7d029f465a3249 SHA256 5105430f145f12bacd13db3959eac356e2ccf144722ed2fcde752190d61336aa
 DIST spawn-fcgi-1.6.1.tar.bz2 71975 RMD160 d906031b3ce40c4a7d682da8acd556f12e8f3fcb SHA1 e18db1367ac1e186972d02e4d9e67a3a34212fc2 SHA256 81301b74d66b8083f23e9c1e39d42fe71995cdf3d06d3beecf3a81a1782f523c
 EBUILD spawn-fcgi-1.6.1.ebuild 834 RMD160 68e16ee083830aa035c5051a7ae464d6da4620f7 SHA1 5b94d69e68fb9dbf10d800c380061c643d0bb7a5 SHA256 eca2be8ef509a5532cf9b1b4d90880169b5025784573c6f62f0bbb42d4638d35
-MISC ChangeLog 451 RMD160 6c29a296b21f00659898edbc2784418a92c0fec6 SHA1 e07e4b11b65e45263775431fc5fac7b37cb7a954 SHA256 6c9c623e653f5bf889ad8e7994bed97a84f1e117545a96a070026f294a752e60
+MISC ChangeLog 628 RMD160 01a15eb2696a10ed12496ec083703001c551b02e SHA1 5a700bd50fbd60446e2f662488ba35cad5d7d540 SHA256 9c13634045847e979a6e00cd6659e09aae4fde29415a8de63a9e1723dbc71c8d
 MISC metadata.xml 454 RMD160 6d518892201f5edddc6a83e119384f5c57661d42 SHA1 37c722d45f2473c24620d92f5bc2b31e92f6385c SHA256 dad5c3b31bdf5cffbec7a56402ecc46a9ed1db288f9e27302ca3d53da5b0fe0c
diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.confd b/www-servers/spawn-fcgi/files/spawn-fcgi.confd
index 78f72e2bd0b3..1c6fd1de1b7b 100644
--- a/www-servers/spawn-fcgi/files/spawn-fcgi.confd
+++ b/www-servers/spawn-fcgi/files/spawn-fcgi.confd
@@ -1,23 +1,32 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v 1.1 2009/04/01 10:12:17 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v 1.2 2009/04/03 18:18:13 bangert Exp $
 
 # DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD!
 
-# One of the following options must be enabled. The filename specified by
+# The FCGI process can be made available through a filesystem socket or
+# through a inet socket. One and only one of the two types must be choosen.
+# Default is the inet socket.
+
+# The filename specified by
 # FCGI_SOCKET will be suffixed with a number for each child process, for
-# example, fcgi.socket-1. The port specified by FCGI_PORT is the port used
-# by the first child process. If this is set to 1234 then subsequent child
-# processes will use 1235, 1236, etc.
-#
+# example, fcgi.socket-1. 
+# Leave empty to use an IP socket (default). See below. Enabling this, 
+# disables the IP socket.
+# 
 FCGI_SOCKET=
-FCGI_PORT=1234
 
 # When using FCGI_PORT, connections will only be accepted from the following
 # address. The default is 127.0.0.1. Use 0.0.0.0 to bind to all addresses.
 #
 FCGI_ADDRESS=127.0.0.1
 
+# The port specified by FCGI_PORT is the port used
+# by the first child process. If this is set to 1234 then subsequent child
+# processes will use 1235, 1236, etc.
+#
+FCGI_PORT=1234
+
 # The path to your FastCGI application. These sometimes carry the .fcgi
 # extension but not always. For PHP, you should usually point this to
 # /usr/bin/php-cgi.
@@ -50,5 +59,5 @@ ALLOWED_ENV=""
 # of child processes to spawn. The second is the number of requests to be
 # served by a single PHP process before it is restarted.
 #
-PHP_FCGI_CHILDREN=5
-PHP_FCGI_MAX_REQUESTS=500
+#PHP_FCGI_CHILDREN=5
+#PHP_FCGI_MAX_REQUESTS=500
diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd b/www-servers/spawn-fcgi/files/spawn-fcgi.initd
index 999a31e689ba..ce7e52220758 100644
--- a/www-servers/spawn-fcgi/files/spawn-fcgi.initd
+++ b/www-servers/spawn-fcgi/files/spawn-fcgi.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.1 2009/04/01 10:12:17 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.2 2009/04/03 18:18:13 bangert Exp $
 
 PROGNAME=${SVCNAME/spawn\-fcgi./}
 SPAWNFCGI=/usr/bin/spawn-fcgi
@@ -26,7 +26,7 @@ start() {
 	fi
 
 	if [[ ! -z "${FCGI_SOCKET}" ]] && [[ ! -z "${FCGI_PORT}" ]]; then
-		eerror "Only one of both must be defined:"
+		eerror "Only one of the two may be defined:"
 		eerror "  FCGI_SOCKET=${FCGI_SOCKET}"
 		eerror "  FCGI_PORT=${FCGI_PORT}"
 		return 1
@@ -70,10 +70,10 @@ start() {
 		local P
 		P=${PIDFILE}-${X}.pid
 		[[ -n "${FCGI_SOCKET}" ]] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}"
-		[[ -n "${FCGI_PORT}" ]] && PORT_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))"
+		[[ -n "${FCGI_PORT}" ]] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))"
 
 		start-stop-daemon --start --pidfile ${P} ${E} --exec ${SPAWNFCGI} -- \
-			${SOCKET_OPTION} ${PORT_OPTION} -f ${FCGI_PROGRAM} -P ${P} ${OPTIONS}
+			${SOCKET_OPTION} ${INET_OPTION} -P ${P} ${OPTIONS} -- ${FCGI_PROGRAM}
 		RETVAL=$?
 		
 		# Stop on error. Don't want to spawn a mess!