[patch] spawn-fcgi.diff

spawn-fcgi.diff (text/plain), 1.12 KB, created by Cédric Krier on 2015-12-08 06:57:55 UTC

--- spawn-fcgi.initd-r2	Tue Dec  8 13:55:53 2015
+++ spawn-fcgi	Tue Dec  8 13:57:08 2015
@@ -5,7 +5,7 @@
 
 PROGNAME=${SVCNAME#*.}
 SPAWNFCGI=/usr/bin/spawn-fcgi
-PIDPATH=/run/spawn-fcgi
+PIDPATH=/var/run/spawn-fcgi
 PIDFILE=${PIDPATH}/${PROGNAME}
 
 depend() {
@@ -81,11 +81,11 @@
 	for i in ${ALLOWED_ENV}; do
 		local j
 		eval j=$(echo \$"$i")
-		[ -n "${j}" ] && E="${E} ${i}=${j}"
+		[ -n "${j}" ] && E="${E} --env ${i}=${j}"
 	done
 
 	ebegin "Starting FastCGI application ${PROGNAME}"
-	checkpath -q -d -m 700 /run/spawn-fcgi
+	checkpath -q -d -m 700 /var/run/spawn-fcgi
 	X=0
 	while [ $X -lt ${FCGI_CHILDREN} ]; do
 		X=$(($X+1))
@@ -94,8 +94,8 @@
 		[ -n "${FCGI_SOCKET}" ] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}"
 		[ -n "${FCGI_PORT}" ] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))"
 
-		env -i ${E} /sbin/start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \
-			--name ${FCGI_PROGRAM_EXEC} -- ${SOCKET_OPTION} ${INET_OPTION} \
+		start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \
+			${E} -- ${SOCKET_OPTION} ${INET_OPTION} \
 			-P ${P} ${OPTIONS} -- ${FCGI_PROGRAM}
 		RETVAL=$?