From 2dfa9135c52c0f5c058a7659bc32471754fe162b Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Fri, 6 Dec 2019 17:16:03 -0600
Subject: Remove invalid ssl-conf-cmd, fix redirect, put commission state in
 /run

---
 etc/init.d/commission         | 8 ++++----
 etc/init.d/commission-php-fpm | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'etc/init.d')

diff --git a/etc/init.d/commission b/etc/init.d/commission
index 03bec24..b9f8174 100755
--- a/etc/init.d/commission
+++ b/etc/init.d/commission
@@ -10,14 +10,14 @@ 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"
+    rm -f "/run/mt-commission"
+else
+    ENABLED="no"
+    echo 'ENABLED="no"' >"/run/mt-commission"
 fi
 
 [ -f "/etc/default/no-${NAME}" ] && . "/etc/default/no-${NAME}"
diff --git a/etc/init.d/commission-php-fpm b/etc/init.d/commission-php-fpm
index 95de811..6867177 100755
--- a/etc/init.d/commission-php-fpm
+++ b/etc/init.d/commission-php-fpm
@@ -22,7 +22,7 @@ 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"
+[ -f "/run/mt-commission" ] && . "/run/mt-commission"
 
 wait_for_pid () {
 	try=0
-- 
cgit v1.2.3