diff options
| author |   Thilo Bangert <bangert@gentoo.org> | 2009-04-10 09:30:25 +0000 |
|---|---|---|
| committer | Thilo Bangert <bangert@gentoo.org> | 2009-04-10 09:30:25 +0000 |
| commit | c2a3b8022bd1348e51a994e1f924af8b99e2a3f0 (patch) | |
| tree | f90582c36938623fb27f40bd4224bb08b67da86d /www-servers/spawn-fcgi | |
| parent | Version bump. Remove intermediate versions. (diff) | |
| download | gentoo-2-c2a3b8022bd1348e51a994e1f924af8b99e2a3f0.tar.gz gentoo-2-c2a3b8022bd1348e51a994e1f924af8b99e2a3f0.tar.bz2 gentoo-2-c2a3b8022bd1348e51a994e1f924af8b99e2a3f0.zip | |
allow arguments to FCGI_PROGRAM
(Portage version: 2.2_rc26/cvs/Linux i686)
Diffstat (limited to 'www-servers/spawn-fcgi')
| -rw-r--r-- | www-servers/spawn-fcgi/ChangeLog | 5 | ||||
| -rw-r--r-- | www-servers/spawn-fcgi/files/spawn-fcgi.initd | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/www-servers/spawn-fcgi/ChangeLog b/www-servers/spawn-fcgi/ChangeLog index b34f8e6e2b91..f74e2d128a50 100644 --- a/www-servers/spawn-fcgi/ChangeLog +++ b/www-servers/spawn-fcgi/ChangeLog @@ -1,6 +1,9 @@ # 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.6 2009/04/09 19:48:39 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/ChangeLog,v 1.7 2009/04/10 09:30:24 bangert Exp $ + + 10 Apr 2009; Thilo Bangert <bangert@gentoo.org> files/spawn-fcgi.initd: + allow arguments to FCGI_PROGRAM 09 Apr 2009; Thilo Bangert <bangert@gentoo.org> files/spawn-fcgi.initd: make multiple environment variables work with stable start-stop-daemon diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd b/www-servers/spawn-fcgi/files/spawn-fcgi.initd index d36d1fec651f..404465a3ba45 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.6 2009/04/09 19:48:39 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.7 2009/04/10 09:30:25 bangert Exp $ PROGNAME=${SVCNAME#*.} SPAWNFCGI=/usr/bin/spawn-fcgi @@ -39,7 +39,7 @@ start() { return 1 fi - local X E OPTIONS i RETVAL + local X E OPTIONS i RETVAL FCGI_PROGRAM_NAME if [ -z "${FCGI_ADDRESS}" ]; then FCGI_ADDRESS=127.0.0.1 @@ -69,16 +69,18 @@ start() { done ebegin "Starting FastCGI application ${PROGNAME}" + FCGI_PROGRAM_NAME=(${FCGI_PROGRAM}) X=0 while [ $X -lt ${FCGI_CHILDREN} ]; do X=$(($X+1)) - local P SOCKET_OPTION INET_OPTION + local P SOCKET_OPTION INET_OPTION P=${PIDFILE}-${X}.pid [ -n "${FCGI_SOCKET}" ] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}" [ -n "${FCGI_PORT}" ] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))" - env ${E} start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} --name ${FCGI_PROGRAM} -- \ - ${SOCKET_OPTION} ${INET_OPTION} -P ${P} ${OPTIONS} -- ${FCGI_PROGRAM} + env ${E} start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \ + --name ${FCGI_PROGRAM_NAME} -- ${SOCKET_OPTION} ${INET_OPTION} \ + -P ${P} ${OPTIONS} -- ${FCGI_PROGRAM} RETVAL=$? # Stop on error. Don't want to spawn a mess! |