[gentoo-commits] repo/gentoo:master commit in: www-servers/spawn-fcgi/files/

[gentoo-commits] repo/gentoo:master commit in: www-servers/spawn-fcgi/files/

[Austin English]

commit:     0abe87b9c382f5effa3f0074215b996568cd9d91
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 06:35:23 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed May 18 06:38:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0abe87b9

www-servers/spawn-fcgi: use #!/sbin/openrc-run instead of #!/sbin/runscript

 www-servers/spawn-fcgi/files/spawn-fcgi.initd-r1 | 2 +-
 www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r1 b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r1
index ae24e43..1bf8183 100644
--- a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r1
+++ b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r1
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2 b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2
index 4621650..4d43232 100644
--- a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2
+++ b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

[gentoo-commits] repo/gentoo:master commit in: www-servers/spawn-fcgi/files/

[Aaron Bauman]

commit:     90ae3016188eec592a0a11c4aa925e3ef0973da2
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Dec 20 20:49:16 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Dec 22 16:00:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90ae3016

www-servers/spawn-fcgi: remove unused file

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14064
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 www-servers/spawn-fcgi/files/spawn-fcgi.initd-r1 | 116 -----------------------
 1 file changed, 116 deletions(-)

diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r1 b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r1
deleted file mode 100644
index 74879c2eb6f..00000000000
--- a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r1
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PROGNAME=${SVCNAME#*.}
-SPAWNFCGI=/usr/bin/spawn-fcgi
-PIDPATH=/var/run/spawn-fcgi
-PIDFILE=${PIDPATH}/${PROGNAME}
-
-depend() {
-	need net
-}
-
-start() {
-	local X E OPTIONS i RETVAL FCGI_PROGRAM_EXEC
-	FCGI_PROGRAM_EXEC=$(echo ${FCGI_PROGRAM} | awk "{print \$1}")
-
-	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 the two may be defined:"
-		eerror "  FCGI_SOCKET=${FCGI_SOCKET}"
-		eerror "  FCGI_PORT=${FCGI_PORT}"
-		return 1
-	fi
-
-	if [ -z "${FCGI_PROGRAM}" ]; then
-		eerror "You need to specify which \$FCGI_PROGRAM"
-		eerror "you want to start."
-		eerror "Please adjust /etc/conf.d/spawn-fcgi.${PROGNAME}"
-		return 1
-	fi
-
-	if [ ! -x "${FCGI_PROGRAM_EXEC}" ]; then
-		eerror "The file specified as \$FCGI_PROGRAM"
-		eerror "does not exist or is not executable."
-		eerror "Please adjust /etc/conf.d/spawn-fcgi.${PROGNAME}"
-		return 1
-	fi
-
-	if [ -z "${FCGI_ADDRESS}" ]; then
-		FCGI_ADDRESS=127.0.0.1
-	fi
-
-	if [ -z "${FCGI_CHILDREN}" ]; then
-		FCGI_CHILDREN=1
-	fi
-
-	if [ -n "${FCGI_CHROOT}" ]; then
-		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
-
-	if [ -n "${FCGI_GROUP}" ] && [ "${FCGI_GROUP}" != "root" ]; then
-		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
-		eval j=$(echo \$"$i")
-		[ -n "${j}" ] && E="${E} ${i}=${j}"
-	done
-
-	ebegin "Starting FastCGI application ${PROGNAME}"
-	checkpath -q -d -m 700 /var/run/spawn-fcgi
-	X=0
-	while [ $X -lt ${FCGI_CHILDREN} ]; do
-		X=$(($X+1))
-		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))"
-
-		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=$?
-
-		# 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}
-}