diff options
| author |   Thilo Bangert <bangert@gentoo.org> | 2009-04-09 19:48:39 +0000 |
|---|---|---|
| committer | Thilo Bangert <bangert@gentoo.org> | 2009-04-09 19:48:39 +0000 |
| commit | 2450331489fe69db32088417130136e36b29b101 (patch) | |
| tree | fb6af1a8a485e5079fa16fa8d7efb83568ae8dad /www-servers/spawn-fcgi | |
| parent | Version bump. (diff) | |
| download | gentoo-2-2450331489fe69db32088417130136e36b29b101.tar.gz gentoo-2-2450331489fe69db32088417130136e36b29b101.tar.bz2 gentoo-2-2450331489fe69db32088417130136e36b29b101.zip | |
make multiple environment variables work with stable start-stop-daemon
(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 | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/www-servers/spawn-fcgi/ChangeLog b/www-servers/spawn-fcgi/ChangeLog index 3aa5a88d3cb9..b34f8e6e2b91 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.5 2009/04/09 18:56:03 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/ChangeLog,v 1.6 2009/04/09 19:48:39 bangert Exp $ + + 09 Apr 2009; Thilo Bangert <bangert@gentoo.org> files/spawn-fcgi.initd: + make multiple environment variables work with stable start-stop-daemon 09 Apr 2009; Thilo Bangert <bangert@gentoo.org> files/spawn-fcgi.confd, files/spawn-fcgi.initd, spawn-fcgi-1.6.1: diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd b/www-servers/spawn-fcgi/files/spawn-fcgi.initd index 38cbc2b57f39..d36d1fec651f 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.5 2009/04/09 18:56:04 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.6 2009/04/09 19:48:39 bangert Exp $ PROGNAME=${SVCNAME#*.} SPAWNFCGI=/usr/bin/spawn-fcgi @@ -65,7 +65,7 @@ start() { for i in ${ALLOWED_ENV}; do local j eval j=$(echo \$"$i") - [ -n "${j}" ] && E="${E} -e ${i}=${j}" + [ -n "${j}" ] && E="${E} ${i}=${j}" done ebegin "Starting FastCGI application ${PROGNAME}" @@ -77,7 +77,7 @@ start() { [ -n "${FCGI_SOCKET}" ] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}" [ -n "${FCGI_PORT}" ] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))" - start-stop-daemon --start --pidfile ${P} ${E} --exec ${SPAWNFCGI} --name ${FCGI_PROGRAM} -- \ + env ${E} start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} --name ${FCGI_PROGRAM} -- \ ${SOCKET_OPTION} ${INET_OPTION} -P ${P} ${OPTIONS} -- ${FCGI_PROGRAM} RETVAL=$? |