* [gentoo-commits] gentoo-x86 commit in www-servers/spawn-fcgi/files: spawn-fcgi.initd spawn-fcgi.confd
@ 2009-04-01 10:12 Thilo Bangert (bangert)
0 siblings, 0 replies; 6+ messages in thread
From: Thilo Bangert (bangert) @ 2009-04-01 10:12 UTC (permalink / raw
To: gentoo-commits
bangert 09/04/01 10:12:17
Added: spawn-fcgi.initd spawn-fcgi.confd
Log:
initial commit - init script adapted from bug #149467 - thanks everybody
(Portage version: 2.2_rc26/cvs/Linux i686)
Revision Changes Path
1.1 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.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?rev=1.1&content-type=text/plain
Index: spawn-fcgi.initd
===================================================================
#!/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.1 2009/04/01 10:12:17 bangert Exp $
PROGNAME=${SVCNAME/spawn\-fcgi./}
SPAWNFCGI=/usr/bin/spawn-fcgi
PIDPATH=/var/run/spawn-fcgi
PIDFILE=${PIDPATH}/${PROGNAME}
depend() {
need net
}
start() {
if [[ "${SVCNAME}" == "spawn-fcgi" ]]; then
eerror "You are not supposed to run this script directly. Create a symlink"
eerror "for the FastCGI application you want to run as well as a copy of the"
eerror "configuration file and modify it appropriately like so..."
eerror
eerror " ln -s spawn-fcgi /etc/init.d/spawn-fcgi.trac"
eerror " cp /etc/conf.d/spawn-fcgi /etc/conf.d/spawn-fcgi.trac"
eerror " `basename "${EDITOR}"` /etc/conf.d/spawn-fcgi.trac"
eerror
return 1
fi
if [[ ! -z "${FCGI_SOCKET}" ]] && [[ ! -z "${FCGI_PORT}" ]]; then
eerror "Only one of both must be defined:"
eerror " FCGI_SOCKET=${FCGI_SOCKET}"
eerror " FCGI_PORT=${FCGI_PORT}"
return 1
fi
local X E OPTIONS SOCKET_OPTION PORT_OPTION RETVAL
if [[ -z "${FCGI_ADDRESS}" ]]; then
FCGI_ADDRESS=127.0.0.1
fi
if [[ -z "${FCGI_CHILDREN}" ]]; then
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
if [[ -n "${FCGI_USER}" ]] && [[ "${FCGI_USER}" != "root" ]]; then
OPTIONS="${OPTIONS} -u ${FCGI_USER}"
fi
if [[ -n "${FCGI_GROUP}" ]] && [[ "${FCGI_GROUP}" != "root" ]]; then
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
[[ -n "${!i}" ]] && E="${E} -e ${i}=${!i}"
done
ebegin "Starting FastCGI application ${PROGNAME}"
for X in `seq 1 ${FCGI_CHILDREN}`; do
local P
P=${PIDFILE}-${X}.pid
[[ -n "${FCGI_SOCKET}" ]] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}"
[[ -n "${FCGI_PORT}" ]] && PORT_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))"
start-stop-daemon --start --pidfile ${P} ${E} --exec ${SPAWNFCGI} -- \
${SOCKET_OPTION} ${PORT_OPTION} -f ${FCGI_PROGRAM} -P ${P} ${OPTIONS}
RETVAL=$?
# Stop on error. Don't want to spawn a mess!
[[ "${RETVAL}" != "0" ]] && break
done
eend ${RETVAL}
}
stop() {
local X RETVAL=0
ebegin "Stopping FastCGI application ${PROGNAME}"
for X in ${PIDFILE}-[0-9]*.pid ; do
start-stop-daemon --stop --pidfile ${X} || \
{ RETVAL=$? && break ; }
done
eend ${RETVAL}
}
1.1 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.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd?rev=1.1&content-type=text/plain
Index: spawn-fcgi.confd
===================================================================
# 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.1 2009/04/01 10:12:17 bangert Exp $
# DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD!
# One of the following options must be enabled. The filename specified by
# FCGI_SOCKET will be suffixed with a number for each child process, for
# example, fcgi.socket-1. The port specified by FCGI_PORT is the port used
# by the first child process. If this is set to 1234 then subsequent child
# processes will use 1235, 1236, etc.
#
FCGI_SOCKET=
FCGI_PORT=1234
# When using FCGI_PORT, connections will only be accepted from the following
# address. The default is 127.0.0.1. Use 0.0.0.0 to bind to all addresses.
#
FCGI_ADDRESS=127.0.0.1
# The path to your FastCGI application. These sometimes carry the .fcgi
# extension but not always. For PHP, you should usually point this to
# /usr/bin/php-cgi.
#
FCGI_PROGRAM=/path/to/application.fcgi
# The number of child processes to spawn. The default is 1. For PHP
# applications, set this to 1 and use PHP_FCGI_CHILDREN instead.
#
FCGI_CHILDREN=1
# If you want to run your application inside a chroot then specify the
# directory here. Leave this blank otherwise.
#
FCGI_CHROOT=
# The user and group to run your application as. If you do not specify these,
# the application will be run as root:root.
#
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.
#
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
# served by a single PHP process before it is restarted.
#
PHP_FCGI_CHILDREN=5
PHP_FCGI_MAX_REQUESTS=500
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/spawn-fcgi/files: spawn-fcgi.initd spawn-fcgi.confd
@ 2009-04-03 18:18 Thilo Bangert (bangert)
0 siblings, 0 replies; 6+ messages in thread
From: Thilo Bangert (bangert) @ 2009-04-03 18:18 UTC (permalink / raw
To: gentoo-commits
bangert 09/04/03 18:18:13
Modified: spawn-fcgi.initd spawn-fcgi.confd
Log:
improve documentation in conf.d - use a different exec approach in init.d
(Portage version: 2.2_rc26/cvs/Linux i686)
Revision Changes Path
1.2 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.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?r1=1.1&r2=1.2
Index: spawn-fcgi.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- spawn-fcgi.initd 1 Apr 2009 10:12:17 -0000 1.1
+++ spawn-fcgi.initd 3 Apr 2009 18:18:13 -0000 1.2
@@ -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.1 2009/04/01 10:12:17 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.2 2009/04/03 18:18:13 bangert Exp $
PROGNAME=${SVCNAME/spawn\-fcgi./}
SPAWNFCGI=/usr/bin/spawn-fcgi
@@ -26,7 +26,7 @@
fi
if [[ ! -z "${FCGI_SOCKET}" ]] && [[ ! -z "${FCGI_PORT}" ]]; then
- eerror "Only one of both must be defined:"
+ eerror "Only one of the two may be defined:"
eerror " FCGI_SOCKET=${FCGI_SOCKET}"
eerror " FCGI_PORT=${FCGI_PORT}"
return 1
@@ -70,10 +70,10 @@
local P
P=${PIDFILE}-${X}.pid
[[ -n "${FCGI_SOCKET}" ]] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}"
- [[ -n "${FCGI_PORT}" ]] && PORT_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))"
+ [[ -n "${FCGI_PORT}" ]] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))"
start-stop-daemon --start --pidfile ${P} ${E} --exec ${SPAWNFCGI} -- \
- ${SOCKET_OPTION} ${PORT_OPTION} -f ${FCGI_PROGRAM} -P ${P} ${OPTIONS}
+ ${SOCKET_OPTION} ${INET_OPTION} -P ${P} ${OPTIONS} -- ${FCGI_PROGRAM}
RETVAL=$?
# Stop on error. Don't want to spawn a mess!
1.2 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.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd?r1=1.1&r2=1.2
Index: spawn-fcgi.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- spawn-fcgi.confd 1 Apr 2009 10:12:17 -0000 1.1
+++ spawn-fcgi.confd 3 Apr 2009 18:18:13 -0000 1.2
@@ -1,23 +1,32 @@
# 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.1 2009/04/01 10:12:17 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v 1.2 2009/04/03 18:18:13 bangert Exp $
# DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD!
-# One of the following options must be enabled. The filename specified by
+# The FCGI process can be made available through a filesystem socket or
+# through a inet socket. One and only one of the two types must be choosen.
+# Default is the inet socket.
+
+# The filename specified by
# FCGI_SOCKET will be suffixed with a number for each child process, for
-# example, fcgi.socket-1. The port specified by FCGI_PORT is the port used
-# by the first child process. If this is set to 1234 then subsequent child
-# processes will use 1235, 1236, etc.
-#
+# example, fcgi.socket-1.
+# Leave empty to use an IP socket (default). See below. Enabling this,
+# disables the IP socket.
+#
FCGI_SOCKET=
-FCGI_PORT=1234
# When using FCGI_PORT, connections will only be accepted from the following
# address. The default is 127.0.0.1. Use 0.0.0.0 to bind to all addresses.
#
FCGI_ADDRESS=127.0.0.1
+# The port specified by FCGI_PORT is the port used
+# by the first child process. If this is set to 1234 then subsequent child
+# processes will use 1235, 1236, etc.
+#
+FCGI_PORT=1234
+
# The path to your FastCGI application. These sometimes carry the .fcgi
# extension but not always. For PHP, you should usually point this to
# /usr/bin/php-cgi.
@@ -50,5 +59,5 @@
# of child processes to spawn. The second is the number of requests to be
# served by a single PHP process before it is restarted.
#
-PHP_FCGI_CHILDREN=5
-PHP_FCGI_MAX_REQUESTS=500
+#PHP_FCGI_CHILDREN=5
+#PHP_FCGI_MAX_REQUESTS=500
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/spawn-fcgi/files: spawn-fcgi.initd spawn-fcgi.confd
@ 2009-04-09 18:56 Thilo Bangert (bangert)
0 siblings, 0 replies; 6+ messages in thread
From: Thilo Bangert (bangert) @ 2009-04-09 18:56 UTC (permalink / raw
To: gentoo-commits
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"
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/spawn-fcgi/files: spawn-fcgi.initd spawn-fcgi.confd
@ 2009-07-03 21:00 Thilo Bangert (bangert)
0 siblings, 0 replies; 6+ messages in thread
From: Thilo Bangert (bangert) @ 2009-07-03 21:00 UTC (permalink / raw
To: gentoo-commits
bangert 09/07/03 21:00:38
Modified: spawn-fcgi.initd spawn-fcgi.confd
Log:
make chdir configurable (bug #274573) - thanks Henry So, Jr.
(Portage version: 2.2_rc33/cvs/Linux i686)
Revision Changes Path
1.9 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.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?r1=1.8&r2=1.9
Index: spawn-fcgi.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- spawn-fcgi.initd 12 Apr 2009 18:00:42 -0000 1.8
+++ spawn-fcgi.initd 3 Jul 2009 21:00:38 -0000 1.9
@@ -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.8 2009/04/12 18:00:42 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.9 2009/07/03 21:00:38 bangert Exp $
PROGNAME=${SVCNAME#*.}
SPAWNFCGI=/usr/bin/spawn-fcgi
@@ -61,6 +61,10 @@
OPTIONS="${OPTIONS} -c ${FCGI_CHROOT}"
fi
+ if [ -n "${FCGI_DIR}" ]; then
+ OPTIONS="${OPTIONS} -d ${FCGI_DIR}"
+ fi
+
if [ -n "${FCGI_USER}" ] && [ "${FCGI_USER}" != "root" ]; then
OPTIONS="${OPTIONS} -u ${FCGI_USER}"
fi
1.4 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.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd?r1=1.3&r2=1.4
Index: spawn-fcgi.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spawn-fcgi.confd 9 Apr 2009 18:56:04 -0000 1.3
+++ spawn-fcgi.confd 3 Jul 2009 21:00:38 -0000 1.4
@@ -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.3 2009/04/09 18:56:04 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v 1.4 2009/07/03 21:00:38 bangert Exp $
# DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD!
@@ -43,6 +43,11 @@
#
FCGI_CHROOT=
+# If you want to run your application from a specific directiory specify
+# it here. Leave this blank otherwise.
+#
+FCGI_CHDIR=
+
# The user and group to run your application as. If you do not specify these,
# the application will be run as root:root.
#
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/spawn-fcgi/files: spawn-fcgi.initd spawn-fcgi.confd
@ 2009-07-03 21:17 Thilo Bangert (bangert)
0 siblings, 0 replies; 6+ messages in thread
From: Thilo Bangert (bangert) @ 2009-07-03 21:17 UTC (permalink / raw
To: gentoo-commits
bangert 09/07/03 21:17:11
Modified: spawn-fcgi.initd spawn-fcgi.confd
Log:
strip env (bug #271425)
(Portage version: 2.2_rc33/cvs/Linux i686)
Revision Changes Path
1.10 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.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?r1=1.9&r2=1.10
Index: spawn-fcgi.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- spawn-fcgi.initd 3 Jul 2009 21:00:38 -0000 1.9
+++ spawn-fcgi.initd 3 Jul 2009 21:17:10 -0000 1.10
@@ -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.9 2009/07/03 21:00:38 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.10 2009/07/03 21:17:10 bangert Exp $
PROGNAME=${SVCNAME#*.}
SPAWNFCGI=/usr/bin/spawn-fcgi
@@ -89,7 +89,7 @@
[ -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} \
+ env -i ${E} /sbin/start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \
--name ${FCGI_PROGRAM_EXEC} -- ${SOCKET_OPTION} ${INET_OPTION} \
-P ${P} ${OPTIONS} -- ${FCGI_PROGRAM}
RETVAL=$?
1.5 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.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd?r1=1.4&r2=1.5
Index: spawn-fcgi.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- spawn-fcgi.confd 3 Jul 2009 21:00:38 -0000 1.4
+++ spawn-fcgi.confd 3 Jul 2009 21:17:11 -0000 1.5
@@ -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.4 2009/07/03 21:00:38 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v 1.5 2009/07/03 21:17:11 bangert Exp $
# DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD!
@@ -57,7 +57,7 @@
# If your application requires additional environment variables, you may
# specify them here. See PHP example below.
#
-ALLOWED_ENV=
+ALLOWED_ENV="PATH"
# 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
@@ -67,4 +67,4 @@
#PHP_FCGI_MAX_REQUESTS=500
#
# For this to work you would set
-# ALLOWED_ENV="PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS"
+# ALLOWED_ENV="PATH PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS"
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/spawn-fcgi/files: spawn-fcgi.initd spawn-fcgi.confd
@ 2009-09-28 8:38 Thilo Bangert (bangert)
0 siblings, 0 replies; 6+ messages in thread
From: Thilo Bangert (bangert) @ 2009-09-28 8:38 UTC (permalink / raw
To: gentoo-commits
bangert 09/09/28 08:38:03
Modified: spawn-fcgi.initd spawn-fcgi.confd
Log:
allow extra options to be passed to spawn-fcgi - bug #284698 - thanks dev-zero
(Portage version: 2.2_rc42/cvs/Linux i686)
Revision Changes Path
1.11 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.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd?r1=1.10&r2=1.11
Index: spawn-fcgi.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- spawn-fcgi.initd 3 Jul 2009 21:17:10 -0000 1.10
+++ spawn-fcgi.initd 28 Sep 2009 08:38:02 -0000 1.11
@@ -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.10 2009/07/03 21:17:10 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.11 2009/09/28 08:38:02 bangert Exp $
PROGNAME=${SVCNAME#*.}
SPAWNFCGI=/usr/bin/spawn-fcgi
@@ -73,6 +73,10 @@
OPTIONS="${OPTIONS} -g ${FCGI_GROUP}"
fi
+ if [ -n "${FCGI_EXTRA_OPTIONS}" ]; then
+ OPTIONS="${OPTIONS} ${FCGI_EXTRA_OPTIONS}"
+ fi
+
unset E
for i in ${ALLOWED_ENV}; do
local j
1.6 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.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd?r1=1.5&r2=1.6
Index: spawn-fcgi.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- spawn-fcgi.confd 3 Jul 2009 21:17:11 -0000 1.5
+++ spawn-fcgi.confd 28 Sep 2009 08:38:02 -0000 1.6
@@ -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.5 2009/07/03 21:17:11 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v 1.6 2009/09/28 08:38:02 bangert Exp $
# DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD!
@@ -54,6 +54,10 @@
FCGI_USER=
FCGI_GROUP=
+# Additional options you might want to pass to spawn-fcgi
+#
+#FCGI_EXTRA_OPTIONS=
+
# If your application requires additional environment variables, you may
# specify them here. See PHP example below.
#
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-09-28 8:38 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-28 8:38 [gentoo-commits] gentoo-x86 commit in www-servers/spawn-fcgi/files: spawn-fcgi.initd spawn-fcgi.confd Thilo Bangert (bangert)
-- strict thread matches above, loose matches on Subject: below --
2009-07-03 21:17 Thilo Bangert (bangert)
2009-07-03 21:00 Thilo Bangert (bangert)
2009-04-09 18:56 Thilo Bangert (bangert)
2009-04-03 18:18 Thilo Bangert (bangert)
2009-04-01 10:12 Thilo Bangert (bangert)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox