diff options
| l--------- | etc/default/commissioning | 1 | ||||
| -rw-r--r-- | etc/default/lighttpd | 5 | ||||
| -rwxr-xr-x | etc/init.d/commissioning | 55 | ||||
| -rwxr-xr-x | etc/init.d/php-fpm-commission (renamed from etc/init.d/php-fpm) | 9 | ||||
| -rw-r--r-- | etc/lighttpd-commission.conf (renamed from etc/lighttpd.conf) | 4 | ||||
| -rw-r--r-- | etc/php-fpm-commission.conf (renamed from etc/php-fpm.conf) | 2 | ||||
| -rw-r--r-- | var/config/default/commissioning | 1 | ||||
| -rw-r--r-- | www/commission/css/bootstrap.css (renamed from www/pages/css/bootstrap.css) | 0 | ||||
| -rw-r--r-- | www/commission/index.php (renamed from www/pages/index.php) | 0 |
9 files changed, 63 insertions, 14 deletions
diff --git a/etc/default/commissioning b/etc/default/commissioning deleted file mode 120000 index 8535433..0000000 --- a/etc/default/commissioning +++ /dev/null @@ -1 +0,0 @@ -/var/config/default/commissioning
\ No newline at end of file diff --git a/etc/default/lighttpd b/etc/default/lighttpd deleted file mode 100644 index f2c58d3..0000000 --- a/etc/default/lighttpd +++ /dev/null @@ -1,5 +0,0 @@ -# This should be replaced by the commissioning -# init script. -# set to "yes" or "no" to control starting on boot -ENABLED="yes" - 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-commission index 6da1428..37cff70 100755 --- a/etc/init.d/php-fpm +++ b/etc/init.d/php-fpm-commission @@ -10,16 +10,17 @@ # Description: starts the PHP FastCGI Process Manager daemon ### END INIT INFO -NAME="php-fpm" +NAME="php-fpm-commission" 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_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 () { @@ -53,7 +54,7 @@ wait_for_pid () { case "$1" in start) - [[ -f /etc/default/$NAME ]] && . /etc/default/"$NAME" + [[ -f /etc/default/commissioning ]] && . /etc/default/commissioning if [[ $ENABLED != "yes" ]]; then echo "$NAME: disabled in /etc/default" exit diff --git a/etc/lighttpd.conf b/etc/lighttpd-commission.conf index 2620a20..67a8189 100644 --- a/etc/lighttpd.conf +++ b/etc/lighttpd-commission.conf @@ -38,7 +38,7 @@ server.modules = ( ## a static document-root, for virtual-hosting take look at the ## server.virtual-* options -server.document-root = "/www/pages/" +server.document-root = "/www/commission/" ## where to send error-messages to server.errorlog = "/var/log/lighttpd.error.log" @@ -146,7 +146,7 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) #server.error-handler-404 = "/error-handler.php" ## to help the rc.scripts -#server.pid-file = "/var/run/lighttpd.pid" +server.pid-file = "/var/run/lighttpd-commission.pid" ###### virtual hosts diff --git a/etc/php-fpm.conf b/etc/php-fpm-commission.conf index 82a665f..c4b0539 100644 --- a/etc/php-fpm.conf +++ b/etc/php-fpm-commission.conf @@ -22,7 +22,7 @@ ; Pid file ; Note: the default prefix is /var ; Default Value: none -pid = run/php-fpm.pid +pid = run/php-fpm-commission.pid ; Error log file ; If it's set to "syslog", log is sent to syslogd instead of being written diff --git a/var/config/default/commissioning b/var/config/default/commissioning deleted file mode 100644 index eb5b3a6..0000000 --- a/var/config/default/commissioning +++ /dev/null @@ -1 +0,0 @@ -ENABLED="yes" diff --git a/www/pages/css/bootstrap.css b/www/commission/css/bootstrap.css index 6167622..6167622 100644 --- a/www/pages/css/bootstrap.css +++ b/www/commission/css/bootstrap.css diff --git a/www/pages/index.php b/www/commission/index.php index 5721968..5721968 100644 --- a/www/pages/index.php +++ b/www/commission/index.php |