diff options
| author |   Thilo Bangert <bangert@gentoo.org> | 2009-09-28 08:38:02 +0000 |
|---|---|---|
| committer | Thilo Bangert <bangert@gentoo.org> | 2009-09-28 08:38:02 +0000 |
| commit | d756b2757d52456fd4d858ce26695ffba12cd5ec (patch) | |
| tree | 3bfa9a7e8cb77811eaaba36834ce46282eed9045 /www-servers | |
| parent | version bump (diff) | |
| download | gentoo-2-d756b2757d52456fd4d858ce26695ffba12cd5ec.tar.gz gentoo-2-d756b2757d52456fd4d858ce26695ffba12cd5ec.tar.bz2 gentoo-2-d756b2757d52456fd4d858ce26695ffba12cd5ec.zip | |
allow extra options to be passed to spawn-fcgi - bug #284698 - thanks dev-zero
(Portage version: 2.2_rc42/cvs/Linux i686)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/spawn-fcgi/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/spawn-fcgi/files/spawn-fcgi.confd | 6 | ||||
| -rw-r--r-- | www-servers/spawn-fcgi/files/spawn-fcgi.initd | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/www-servers/spawn-fcgi/ChangeLog b/www-servers/spawn-fcgi/ChangeLog index 6946046e587b..52b637a2abea 100644 --- a/www-servers/spawn-fcgi/ChangeLog +++ b/www-servers/spawn-fcgi/ChangeLog @@ -1,6 +1,10 @@ # 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.20 2009/09/28 08:29:11 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/ChangeLog,v 1.21 2009/09/28 08:38:02 bangert Exp $ + + 28 Sep 2009; Thilo Bangert <bangert@gentoo.org> files/spawn-fcgi.confd, + files/spawn-fcgi.initd: + allow for additional spawn-fcgi options - bug #284698 *spawn-fcgi-1.6.3 (28 Sep 2009) diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.confd b/www-servers/spawn-fcgi/files/spawn-fcgi.confd index 8f7901234710..c2d3dd3ed82a 100644 --- a/www-servers/spawn-fcgi/files/spawn-fcgi.confd +++ b/www-servers/spawn-fcgi/files/spawn-fcgi.confd @@ -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_CHDIR= 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. # diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd b/www-servers/spawn-fcgi/files/spawn-fcgi.initd index 0d6abd0e784d..0b138cecca7e 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.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 @@ start() { 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 |