From 222c163ed5ca6e1933262a6563c903154b6168e1 Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 2 Dec 2019 13:56:46 -0600 Subject: Move commisioning so it is independent of default lighttpd, php-fpm --- etc/init.d/commissioning | 55 +++++++++++++++ etc/init.d/php-fpm | 159 ----------------------------------------- etc/init.d/php-fpm-commission | 160 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 215 insertions(+), 159 deletions(-) create mode 100755 etc/init.d/commissioning delete mode 100755 etc/init.d/php-fpm create mode 100755 etc/init.d/php-fpm-commission (limited to 'etc/init.d') diff --git a/etc/init.d/commissioning b/etc/init.d/commissioning new file mode 100755 index 0000000..11b0eb3 --- /dev/null +++ b/etc/init.d/commissioning @@ -0,0 +1,55 @@ +#!/bin/sh + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/lighttpd +DAEMONNAME="lighttpd" +NAME=commissioning +DESC="Lighttpd Web Server" +OPTS="-f /etc/lighttpd-commission.conf" +PIDFILE=/var/run/lighttpd-commission.pid + +ENABLED=yes +[ -f /etc/default/$NAME ] && . /etc/default/$NAME +# /etc/default/no-${NAME} should point at /etc/default/.no-${NAME} +# and contain ENABLED="no". +# This will prevent commissioning on a factory reset +# but not on an image update for tighter security. +[ -f "/etc/default/no-${NAME}" ] && . "/etc/config/no-${NAME}" + + +case "$1" in + start) + if [ "$ENABLED" != "yes" ]; then + echo "$NAME: disabled in /etc/default" + exit + fi + echo -n "Starting $DESC: " + start-stop-daemon --start -x "$DAEMON" -- $OPTS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop -p ${PIDFILE} -x "$DAEMON" + echo "$NAME." + ;; + reload) + echo -n "Reloading $DESC: " + set -x + pkill -HUP -F ${PIDFILE} "$DAEMONNAME" + echo "$NAME." + ;; + restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon --stop -p ${PIDFILE} -x "$DAEMON" + sleep 1 + start-stop-daemon --start -x "$DAEMON" -- $OPTS + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/etc/init.d/php-fpm b/etc/init.d/php-fpm deleted file mode 100755 index 6da1428..0000000 --- a/etc/init.d/php-fpm +++ /dev/null @@ -1,159 +0,0 @@ -#! /bin/sh - -### BEGIN INIT INFO -# Provides: php-fpm -# Required-Start: $remote_fs $network -# Required-Stop: $remote_fs $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: starts php-fpm -# Description: starts the PHP FastCGI Process Manager daemon -### END INIT INFO - -NAME="php-fpm" -prefix=/usr -exec_prefix=/usr - -php_fpm_BIN=/usr/sbin/php-fpm -php_fpm_CONF=/etc/php-fpm.conf -php_fpm_PID=/var/run/php-fpm.pid - - -php_opts="-R --fpm-config $php_fpm_CONF --pid $php_fpm_PID" - - -wait_for_pid () { - try=0 - - while test $try -lt 35 ; do - - case "$1" in - 'created') - if [ -f "$2" ] ; then - try='' - break - fi - ;; - - 'removed') - if [ ! -f "$2" ] ; then - try='' - break - fi - ;; - esac - - echo -n . - try=`expr $try + 1` - sleep 1 - - done - -} - -case "$1" in - start) - [[ -f /etc/default/$NAME ]] && . /etc/default/"$NAME" - if [[ $ENABLED != "yes" ]]; then - echo "$NAME: disabled in /etc/default" - exit - fi - - echo -n "Starting php-fpm " - - $php_fpm_BIN --daemonize $php_opts - - if [ "$?" != 0 ] ; then - echo " failed" - exit 1 - fi - - wait_for_pid created $php_fpm_PID - - if [ -n "$try" ] ; then - echo " failed" - exit 1 - else - echo " done" - fi - ;; - - stop) - echo -n "Gracefully shutting down php-fpm " - - if [ ! -r $php_fpm_PID ] ; then - echo "warning, no pid file found - php-fpm is not running ?" - exit 1 - fi - - kill -QUIT `cat $php_fpm_PID` - - wait_for_pid removed $php_fpm_PID - - if [ -n "$try" ] ; then - echo " failed. Use force-quit" - exit 1 - else - echo " done" - fi - ;; - - status) - if [ ! -r $php_fpm_PID ] ; then - echo "php-fpm is stopped" - exit 0 - fi - - PID=`cat $php_fpm_PID` - if ps -p $PID | grep -q $PID; then - echo "php-fpm (pid $PID) is running..." - else - echo "php-fpm dead but pid file exists" - fi - ;; - - force-quit) - echo -n "Terminating php-fpm " - - if [ ! -r $php_fpm_PID ] ; then - echo "warning, no pid file found - php-fpm is not running ?" - exit 1 - fi - - kill -TERM `cat $php_fpm_PID` - - wait_for_pid removed $php_fpm_PID - - if [ -n "$try" ] ; then - echo " failed" - exit 1 - else - echo " done" - fi - ;; - - restart) - $0 stop - $0 start - ;; - - reload) - - echo -n "Reload service php-fpm " - - if [ ! -r $php_fpm_PID ] ; then - echo "warning, no pid file found - php-fpm is not running ?" - exit 1 - fi - - kill -USR2 `cat $php_fpm_PID` - - echo " done" - ;; - - *) - echo "Usage: $0 {start|stop|force-quit|restart|reload|status}" - exit 1 - ;; - -esac diff --git a/etc/init.d/php-fpm-commission b/etc/init.d/php-fpm-commission new file mode 100755 index 0000000..37cff70 --- /dev/null +++ b/etc/init.d/php-fpm-commission @@ -0,0 +1,160 @@ +#! /bin/sh + +### BEGIN INIT INFO +# Provides: php-fpm +# Required-Start: $remote_fs $network +# Required-Stop: $remote_fs $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: starts php-fpm +# Description: starts the PHP FastCGI Process Manager daemon +### END INIT INFO + +NAME="php-fpm-commission" +prefix=/usr +exec_prefix=/usr + +php_fpm_BIN=/usr/sbin/php-fpm +php_fpm_CONF="/etc/${NAME}.conf" +php_fpm_PID="/var/run/${NAME}.pid" + + +php_opts="-R --fpm-config $php_fpm_CONF --pid $php_fpm_PID" +ENABLED="yes" + + +wait_for_pid () { + try=0 + + while test $try -lt 35 ; do + + case "$1" in + 'created') + if [ -f "$2" ] ; then + try='' + break + fi + ;; + + 'removed') + if [ ! -f "$2" ] ; then + try='' + break + fi + ;; + esac + + echo -n . + try=`expr $try + 1` + sleep 1 + + done + +} + +case "$1" in + start) + [[ -f /etc/default/commissioning ]] && . /etc/default/commissioning + if [[ $ENABLED != "yes" ]]; then + echo "$NAME: disabled in /etc/default" + exit + fi + + echo -n "Starting php-fpm " + + $php_fpm_BIN --daemonize $php_opts + + if [ "$?" != 0 ] ; then + echo " failed" + exit 1 + fi + + wait_for_pid created $php_fpm_PID + + if [ -n "$try" ] ; then + echo " failed" + exit 1 + else + echo " done" + fi + ;; + + stop) + echo -n "Gracefully shutting down php-fpm " + + if [ ! -r $php_fpm_PID ] ; then + echo "warning, no pid file found - php-fpm is not running ?" + exit 1 + fi + + kill -QUIT `cat $php_fpm_PID` + + wait_for_pid removed $php_fpm_PID + + if [ -n "$try" ] ; then + echo " failed. Use force-quit" + exit 1 + else + echo " done" + fi + ;; + + status) + if [ ! -r $php_fpm_PID ] ; then + echo "php-fpm is stopped" + exit 0 + fi + + PID=`cat $php_fpm_PID` + if ps -p $PID | grep -q $PID; then + echo "php-fpm (pid $PID) is running..." + else + echo "php-fpm dead but pid file exists" + fi + ;; + + force-quit) + echo -n "Terminating php-fpm " + + if [ ! -r $php_fpm_PID ] ; then + echo "warning, no pid file found - php-fpm is not running ?" + exit 1 + fi + + kill -TERM `cat $php_fpm_PID` + + wait_for_pid removed $php_fpm_PID + + if [ -n "$try" ] ; then + echo " failed" + exit 1 + else + echo " done" + fi + ;; + + restart) + $0 stop + $0 start + ;; + + reload) + + echo -n "Reload service php-fpm " + + if [ ! -r $php_fpm_PID ] ; then + echo "warning, no pid file found - php-fpm is not running ?" + exit 1 + fi + + kill -USR2 `cat $php_fpm_PID` + + echo " done" + ;; + + *) + echo "Usage: $0 {start|stop|force-quit|restart|reload|status}" + exit 1 + ;; + +esac -- cgit v1.2.3