[gentoo-commits] gentoo-x86 commit in www-servers/spawn-fcgi/files: spawn-fcgi.initd spawn-fcgi.confd

[Thilo Bangert (bangert)]

bangert     09/04/09 18:56:04

  Modified:             spawn-fcgi.initd spawn-fcgi.confd
  Log:
  keepdir - fix init script for old baselayout (bug #265454)- some minor cleanups
  (Portage version: 2.2_rc26/cvs/Linux i686)

Revision  Changes    Path
1.5                  www-servers/spawn-fcgi/files/spawn-fcgi.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?r1=1.4&r2=1.5

Index: spawn-fcgi.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- spawn-fcgi.initd	7 Apr 2009 08:39:00 -0000	1.4
+++ spawn-fcgi.initd	9 Apr 2009 18:56:04 -0000	1.5
@@ -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.4 2009/04/07 08:39:00 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.5 2009/04/09 18:56:04 bangert Exp $
 
 PROGNAME=${SVCNAME#*.}
 SPAWNFCGI=/usr/bin/spawn-fcgi
@@ -32,7 +32,14 @@
 		return 1
 	fi
 
-	local X E OPTIONS SOCKET_OPTION PORT_OPTION RETVAL
+	if [ -z "${FCGI_PROGRAM}" ]; then
+		eerror "You need to specify which FCGI program you want"
+		eerror "spawn-fcgi to start."
+		eerror "Look at /etc/conf.d/spawn-fcgi.${PROGNAME}"
+		return 1
+	fi
+
+	local X E OPTIONS i RETVAL
 
 	if [ -z "${FCGI_ADDRESS}" ]; then
 		FCGI_ADDRESS=127.0.0.1
@@ -42,10 +49,6 @@
 		FCGI_CHILDREN=1
 	fi
 
-	if [ -n "${PHP_FCGI_CHILDREN}" ]; then
-		OPTIONS="${OPTIONS} -C ${PHP_FCGI_CHILDREN}"
-	fi
-
 	if [ -n "${FCGI_CHROOT}" ]; then
 		OPTIONS="${OPTIONS} -c ${FCGI_CHROOT}"
 	fi
@@ -58,27 +61,23 @@
 		OPTIONS="${OPTIONS} -g ${FCGI_GROUP}"
 	fi
 
-	ALLOWED_ENV="$ALLOWED_ENV USER GROUPS PHP_FCGI_MAX_REQUESTS RAILS_ENV TRAC_ENV_PARENT_DIR TRAC_ENV"
 	unset E
-
 	for i in ${ALLOWED_ENV}; do
-		eval j='"$i"'
+		local j
+		eval j=$(echo \$"$i")
 		[ -n "${j}" ] && E="${E} -e ${i}=${j}"
 	done
 
-	#make sure pidfile dir exists
-	install -d "${PIDPATH}" -m 0700 -o root
-
 	ebegin "Starting FastCGI application ${PROGNAME}"
 	X=0
 	while [ $X -lt ${FCGI_CHILDREN} ]; do
 		X=$(($X+1))
-		local P
+		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))"
 
-		start-stop-daemon --start --pidfile ${P} ${E} --exec ${SPAWNFCGI} -- \
+		start-stop-daemon --start --pidfile ${P} ${E} --exec ${SPAWNFCGI} --name ${FCGI_PROGRAM} -- \
 			${SOCKET_OPTION} ${INET_OPTION} -P ${P} ${OPTIONS} -- ${FCGI_PROGRAM}
 		RETVAL=$?
 



1.3                  www-servers/spawn-fcgi/files/spawn-fcgi.confd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd?r1=1.2&r2=1.3

Index: spawn-fcgi.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- spawn-fcgi.confd	3 Apr 2009 18:18:13 -0000	1.2
+++ spawn-fcgi.confd	9 Apr 2009 18:56:04 -0000	1.3
@@ -1,6 +1,6 @@
 # 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.2 2009/04/03 18:18:13 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v 1.3 2009/04/09 18:56:04 bangert Exp $
 
 # DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD!
 
@@ -31,10 +31,10 @@
 # extension but not always. For PHP, you should usually point this to
 # /usr/bin/php-cgi.
 #
-FCGI_PROGRAM=/path/to/application.fcgi
+#FCGI_PROGRAM=/usr/bin/php-cgi
+FCGI_PROGRAM=
 
-# The number of child processes to spawn. The default is 1. For PHP
-# applications, set this to 1 and use PHP_FCGI_CHILDREN instead.
+# The number of child processes to spawn. The default is 1.
 #
 FCGI_CHILDREN=1
 
@@ -49,11 +49,10 @@
 FCGI_USER=
 FCGI_GROUP=
 
-# If your application requires additional environment variables, you need to
-# allow them here. Only the variables specified here, plus a few others
-# mentioned in the init script are passed to the application.
+# If your application requires additional environment variables, you may
+# specify them here. See PHP example below.
 #
-ALLOWED_ENV=""
+ALLOWED_ENV=
 
 # PHP ONLY :: These two options are specific to PHP. The first is the number
 # of child processes to spawn. The second is the number of requests to be
@@ -61,3 +60,6 @@
 #
 #PHP_FCGI_CHILDREN=5
 #PHP_FCGI_MAX_REQUESTS=500
+#
+# For this to work you would set
+# ALLOWED_ENV="PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS"