From 9c8611ad90438e3107cc5070a1fad2fbba2eaf56 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 29 Nov 2023 14:06:22 -0600
Subject: [PATCH] update

---
 defaults.inc   |  2 +-
 inc/status.inc | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index ccac8daf..2c9fcaf4 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERS='4.16.16-11292023'
+VERS='4.16.17-11292023'
 
 noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log '
 CERT_DAEMON='/snap/bin/certbot'
diff --git a/inc/status.inc b/inc/status.inc
index 308b2c6e..9de5e0f1 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -292,6 +292,9 @@ STATUS(){
 										fi
 									fi
 									[ "${mysqlgo}" = "true" ] && unset mysqlgo
+								else
+									echo -e "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled, not in primary role${idsCL[Default]}"
+									
 								fi
 								sr=`expr $sr + 1`
 							done
@@ -311,15 +314,15 @@ STATUS(){
 								tmp=${NM_SINGLESRVR_DOCKERS[${NTYPE}]}
 								if [[ ${tmp[@]} =~ ${docker} ]]; then
 									if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP[${NTYPE}]}* ]]; then
-										SSDCHK=false
+										SDCHK=false
 										rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
 									else
-										SSDCHK=true
+										SDCHK=true
 									fi
 								else
-									SSDCHK=true
+									SDCHK=true
 								fi
-								if [ ${SSDCHK} == true ]; then
+								if [ ${SDCHK} == true ]; then
 									if [ "${ST_ACTION}" != "check" ]; then
 										if [ "${ST_ACTION}" != "report" ]; then
 											c=0; cw=${PRI_CW}; spc=''
@@ -378,6 +381,8 @@ STATUS(){
 										fi
 										rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
 									fi
+								else
+									echo -e "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled, not in primary role${idsCL[Default]}"
 								fi
 							done
 						fi