| 1 |
bangert 09/04/04 10:40:24 |
| 2 |
|
| 3 |
Modified: spawn-fcgi.initd |
| 4 |
Log: |
| 5 |
posixify init script - bug #260162 - thanks drizzt |
| 6 |
(Portage version: 2.2_rc26/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 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.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?r1=1.2&r2=1.3 |
| 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.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- spawn-fcgi.initd 3 Apr 2009 18:18:13 -0000 1.2 |
| 22 |
+++ spawn-fcgi.initd 4 Apr 2009 10:40:24 -0000 1.3 |
| 23 |
@@ -1,9 +1,9 @@ |
| 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.2 2009/04/03 18:18:13 bangert Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.3 2009/04/04 10:40:24 bangert Exp $ |
| 29 |
|
| 30 |
-PROGNAME=${SVCNAME/spawn\-fcgi./} |
| 31 |
+PROGNAME=${SVCNAME#*.} |
| 32 |
SPAWNFCGI=/usr/bin/spawn-fcgi |
| 33 |
PIDPATH=/var/run/spawn-fcgi |
| 34 |
PIDFILE=${PIDPATH}/${PROGNAME} |
| 35 |
@@ -13,7 +13,7 @@ |
| 36 |
} |
| 37 |
|
| 38 |
start() { |
| 39 |
- if [[ "${SVCNAME}" == "spawn-fcgi" ]]; then |
| 40 |
+ if [ "${SVCNAME}" = "spawn-fcgi" ]; then |
| 41 |
eerror "You are not supposed to run this script directly. Create a symlink" |
| 42 |
eerror "for the FastCGI application you want to run as well as a copy of the" |
| 43 |
eerror "configuration file and modify it appropriately like so..." |
| 44 |
@@ -25,7 +25,7 @@ |
| 45 |
return 1 |
| 46 |
fi |
| 47 |
|
| 48 |
- if [[ ! -z "${FCGI_SOCKET}" ]] && [[ ! -z "${FCGI_PORT}" ]]; then |
| 49 |
+ if [ ! -z "${FCGI_SOCKET}" ] && [ ! -z "${FCGI_PORT}" ]; then |
| 50 |
eerror "Only one of the two may be defined:" |
| 51 |
eerror " FCGI_SOCKET=${FCGI_SOCKET}" |
| 52 |
eerror " FCGI_PORT=${FCGI_PORT}" |
| 53 |
@@ -34,27 +34,27 @@ |
| 54 |
|
| 55 |
local X E OPTIONS SOCKET_OPTION PORT_OPTION RETVAL |
| 56 |
|
| 57 |
- if [[ -z "${FCGI_ADDRESS}" ]]; then |
| 58 |
+ if [ -z "${FCGI_ADDRESS}" ]; then |
| 59 |
FCGI_ADDRESS=127.0.0.1 |
| 60 |
fi |
| 61 |
|
| 62 |
- if [[ -z "${FCGI_CHILDREN}" ]]; then |
| 63 |
+ if [ -z "${FCGI_CHILDREN}" ]; then |
| 64 |
FCGI_CHILDREN=1 |
| 65 |
fi |
| 66 |
|
| 67 |
- if [[ -n "${PHP_FCGI_CHILDREN}" ]]; then |
| 68 |
+ if [ -n "${PHP_FCGI_CHILDREN}" ]; then |
| 69 |
OPTIONS="${OPTIONS} -C ${PHP_FCGI_CHILDREN}" |
| 70 |
fi |
| 71 |
|
| 72 |
- if [[ -n "${FCGI_CHROOT}" ]]; then |
| 73 |
+ if [ -n "${FCGI_CHROOT}" ]; then |
| 74 |
OPTIONS="${OPTIONS} -c ${FCGI_CHROOT}" |
| 75 |
fi |
| 76 |
|
| 77 |
- if [[ -n "${FCGI_USER}" ]] && [[ "${FCGI_USER}" != "root" ]]; then |
| 78 |
+ if [ -n "${FCGI_USER}" ] && [ "${FCGI_USER}" != "root" ]; then |
| 79 |
OPTIONS="${OPTIONS} -u ${FCGI_USER}" |
| 80 |
fi |
| 81 |
|
| 82 |
- if [[ -n "${FCGI_GROUP}" ]] && [[ "${FCGI_GROUP}" != "root" ]]; then |
| 83 |
+ if [ -n "${FCGI_GROUP}" ] && [ "${FCGI_GROUP}" != "root" ]; then |
| 84 |
OPTIONS="${OPTIONS} -g ${FCGI_GROUP}" |
| 85 |
fi |
| 86 |
|
| 87 |
@@ -62,22 +62,25 @@ |
| 88 |
unset E |
| 89 |
|
| 90 |
for i in ${ALLOWED_ENV}; do |
| 91 |
- [[ -n "${!i}" ]] && E="${E} -e ${i}=${!i}" |
| 92 |
+ eval j='"$i"' |
| 93 |
+ [ -n "${j}" ] && E="${E} -e ${i}=${j}" |
| 94 |
done |
| 95 |
|
| 96 |
ebegin "Starting FastCGI application ${PROGNAME}" |
| 97 |
- for X in `seq 1 ${FCGI_CHILDREN}`; do |
| 98 |
+ X=0 |
| 99 |
+ while [ $X -lt ${FCGI_CHILDREN} ]; do |
| 100 |
+ X=$(($X+1)) |
| 101 |
local P |
| 102 |
P=${PIDFILE}-${X}.pid |
| 103 |
- [[ -n "${FCGI_SOCKET}" ]] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}" |
| 104 |
- [[ -n "${FCGI_PORT}" ]] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))" |
| 105 |
+ [ -n "${FCGI_SOCKET}" ] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}" |
| 106 |
+ [ -n "${FCGI_PORT}" ] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))" |
| 107 |
|
| 108 |
start-stop-daemon --start --pidfile ${P} ${E} --exec ${SPAWNFCGI} -- \ |
| 109 |
${SOCKET_OPTION} ${INET_OPTION} -P ${P} ${OPTIONS} -- ${FCGI_PROGRAM} |
| 110 |
RETVAL=$? |
| 111 |
|
| 112 |
# Stop on error. Don't want to spawn a mess! |
| 113 |
- [[ "${RETVAL}" != "0" ]] && break |
| 114 |
+ [ "${RETVAL}" != "0" ] && break |
| 115 |
done |
| 116 |
eend ${RETVAL} |
| 117 |
} |
Archives