From 76b5dfb8142e7c8afde7c3664a6dfc755bae3484 Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 4 Dec 2019 14:13:30 -0600 Subject: Change commissioning to commission in most cases --- commissioning.bb | 6 -- etc/init.d/commission | 68 +++++++++++++++++ etc/init.d/commission-php-fpm | 161 +++++++++++++++++++++++++++++++++++++++ etc/init.d/commissioning | 68 ----------------- etc/init.d/php-fpm-commission | 161 --------------------------------------- usr/libexec/commission/off.sh | 4 + usr/libexec/commissioning/off.sh | 4 - 7 files changed, 233 insertions(+), 239 deletions(-) delete mode 100644 commissioning.bb create mode 100755 etc/init.d/commission create mode 100755 etc/init.d/commission-php-fpm delete mode 100755 etc/init.d/commissioning delete mode 100755 etc/init.d/php-fpm-commission create mode 100755 usr/libexec/commission/off.sh delete mode 100755 usr/libexec/commissioning/off.sh diff --git a/commissioning.bb b/commissioning.bb deleted file mode 100644 index 415945c..0000000 --- a/commissioning.bb +++ /dev/null @@ -1,6 +0,0 @@ -# also needed for php-fpm-commission -inherit update-rc.d - -INITSCRIPT_PARAMS_${PN}-autostart = "update-rc.d commissioning start 2 3 4 5 . " - -# update-rc.d commissioning start 2 3 4 5 . diff --git a/etc/init.d/commission b/etc/init.d/commission new file mode 100755 index 0000000..03bec24 --- /dev/null +++ b/etc/init.d/commission @@ -0,0 +1,68 @@ +#!/bin/sh + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/lighttpd +DAEMONNAME="lighttpd" +NAME=commission +DESC="Lighttpd Web Server" +OPTS="-f /etc/lighttpd-commission.conf" +PIDFILE=/var/run/lighttpd-commission.pid +CONF_DIR=/var/config +ENABLED=yes + +[ -f "/etc/default/${NAME}" ] && . "/etc/default/${NAME}" + +PASSWORDS=$(passwd -Sa | egrep '^[^[:space:]]+[[:space:]]P[[:space:]]' | wc -l) +if (($PASSWORDS == 0)) ; then + # No password, so indicate commissioning mode + # php-fpm-commision will be turned on as well + rm -f /etc/default/$NAME + ENABLED="yes" +fi + +[ -f "/etc/default/no-${NAME}" ] && . "/etc/default/no-${NAME}" + +if [ ! -f $CONF_DIR/server.pem ]; then + echo "Generating server cert" + openssl req \ + -x509 -nodes -days 3650 \ + -subj '/C=US/ST=Minnesota/L=Minneapolis/CN=mlinux.example.com' \ + -newkey rsa:2048 -keyout $CONF_DIR/server.pem -out $CONF_DIR/server.pem +fi + +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/commission-php-fpm b/etc/init.d/commission-php-fpm new file mode 100755 index 0000000..95de811 --- /dev/null +++ b/etc/init.d/commission-php-fpm @@ -0,0 +1,161 @@ +#! /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 + +[ -f "/etc/default/commission" ] && . "/etc/default/commission" + +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/commission ]] && . /etc/default/commission + 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/commissioning b/etc/init.d/commissioning deleted file mode 100755 index 82bda67..0000000 --- a/etc/init.d/commissioning +++ /dev/null @@ -1,68 +0,0 @@ -#!/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 -CONF_DIR=/var/config -ENABLED=yes - -[ -f "/etc/default/${NAME}" ] && . "/etc/default/${NAME}" - -PASSWORDS=$(passwd -Sa | egrep '^[^[:space:]]+[[:space:]]P[[:space:]]' | wc -l) -if (($PASSWORDS == 0)) ; then - # No password, so indicate commissioning mode - # php-fpm-commision will be turned on as well - rm -f /etc/default/$NAME - ENABLED="yes" -fi - -[ -f "/etc/default/no-${NAME}" ] && . "/etc/default/no-${NAME}" - -if [ ! -f $CONF_DIR/server.pem ]; then - echo "Generating server cert" - openssl req \ - -x509 -nodes -days 3650 \ - -subj '/C=US/ST=Minnesota/L=Minneapolis/CN=mlinux.example.com' \ - -newkey rsa:2048 -keyout $CONF_DIR/server.pem -out $CONF_DIR/server.pem -fi - -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-commission b/etc/init.d/php-fpm-commission deleted file mode 100755 index cd86ab5..0000000 --- a/etc/init.d/php-fpm-commission +++ /dev/null @@ -1,161 +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-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 - -[ -f "/etc/default/commissioning" ] && . "/etc/default/commissioning" - -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 diff --git a/usr/libexec/commission/off.sh b/usr/libexec/commission/off.sh new file mode 100755 index 0000000..4911c47 --- /dev/null +++ b/usr/libexec/commission/off.sh @@ -0,0 +1,4 @@ +#!/bin/bash +sleep 30 +/etc/init.d/commission stop 2>&1 | logger -p local0.crit +/etc/init.d/php-fpm-commission stop 2>&1 | logger -p local0.crit diff --git a/usr/libexec/commissioning/off.sh b/usr/libexec/commissioning/off.sh deleted file mode 100755 index 5be4eb4..0000000 --- a/usr/libexec/commissioning/off.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -sleep 30 -/etc/init.d/commissioning stop 2>&1 | logger -p local0.crit -/etc/init.d/php-fpm-commission stop 2>&1 | logger -p local0.crit -- cgit v1.2.3