From 2b2fc0fb4c72f9db84a1e41c8522cb3d69423002 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Thu, 16 Nov 2023 08:21:03 -0600
Subject: [PATCH] update

---
 inc/services.inc | 12 ++++++------
 inc/sites.inc    |  2 +-
 inc/status.inc   | 26 +++++++++++++++++++++-----
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/inc/services.inc b/inc/services.inc
index 9ed20dd2..92048938 100755
--- a/inc/services.inc
+++ b/inc/services.inc
@@ -102,7 +102,7 @@ SERVICE(){
 			fi
 			checkhost=$(CHECK_HOST ${nip})
 			if [ "${checkhost}" != "false" ]; then
-				#$NCMD systemctl $2 $1 > /dev/null 2>&1
+				#${NCMD} systemctl $2 $1 > /dev/null 2>&1
 				if [ "${3}" != "q" ]; then
 					if [[ "enable,disable" = *"${2}"* ]] || [ "${1}" = "daemon-reload" ]; then
 						echo -e "${idsCL[Green]}Done${idsCL[Default]}"
@@ -138,7 +138,7 @@ SERVICE(){
 				fi
 				checkhost=$(CHECK_HOST ${nip})
 				if [ "${checkhost}" != "false" ]; then
-					#$NCMD mount -a > /dev/null 2>&1
+					#${NCMD} mount -a > /dev/null 2>&1
 					if [ "${3}" != "q" ]; then
 						# if [[ "${NCHOSTS}" == *"${nip}"* ]]; then
 						if [[ " ${NC_HOSTS[*]} " =~ " ${nip} " ]]; then
@@ -307,11 +307,11 @@ SERVICE(){
 					
 							NOGOCHK=true;
 							if [ "${1}" == "gitea" ]; then
-								if [[ $($NCMD ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) != *$(GET_AUTHELIA_IP)* ]]; then
+								if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) != *$(GET_AUTHELIA_IP)* ]]; then
 									NOGOCHK=false;
 								fi
 							elif [ "${1}" == "headscale" ]; then
-								if [[ $($NCMD ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['HS']}* ]]; then
+								if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['HS']}* ]]; then
 									NOGOCHK=false;
 								fi
 							fi
@@ -334,10 +334,10 @@ SERVICE(){
 									else
 										[ "${1}" = "pdnsadmin" ] && srva="pdnsadmin.socket pdnsadmin.service" || srva=${1}
 										if [ "${2}" != "status" ]; then
-											$NCMD systemctl ${2} ${srva} >/dev/null 2>&1
+											${NCMD} systemctl ${2} ${srva} >/dev/null 2>&1
 										else
 											echo
-											$NCMD systemctl ${2} ${srva}
+											${NCMD} systemctl ${2} ${srva}
 											echo
 										fi
 										if [ "${3}" != "q" ] && [ "${2}" != "status" ]; then
diff --git a/inc/sites.inc b/inc/sites.inc
index 836d1669..09b4aa4b 100755
--- a/inc/sites.inc
+++ b/inc/sites.inc
@@ -546,7 +546,7 @@ SITEINFO(){
 	done
 	
 	if [ "${onefacline}" == "" ]; then
-		[ "$($NCMD ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)" != "${NM_AUTHELIA_IP}" ] && ACMD="ssh root@${NM_AUTHELIA_IP}" || ACMD=""
+		[ "$(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)" != "${NM_AUTHELIA_IP}" ] && ACMD="ssh root@${NM_AUTHELIA_IP}" || ACMD=""
 		autheliaconfig=$(${ACMD} cat ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml)
 		onefacline=$(echo "${autheliaconfig}" | grep -Fn one_factor | sort | tail -n1)
 		onefacline=${onefacline%%:*}
diff --git a/inc/status.inc b/inc/status.inc
index bef6e3d7..6ade506b 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -112,8 +112,24 @@ STATUS(){
 			if [ "${ST_ACTION}" != "check" ]; then echo; fi
 		fi
 		########################
-		
+		ntypesel=""
 		for NTYPE in "${NM_NODE_TYPES[@]}"; do
+			if [ "${ST_ACTION}" == "${NTYPE}" ]; then
+				ntypesel=${NTYPE}
+				break
+			fi
+		done
+		if [ "${ntypesel}" != "" ]; then
+			ntypesel=(${ntypesel})
+		else
+			ntypesel=${NM_NODE_TYPES[@]}
+		fi
+		
+		for NTYPE in "${!ntypesel}"; do
+			echo "HERE: $NTYPE"
+		done
+		
+		for NTYPE in "${NM_NODE_TYPESsss[@]}"; do
 			nid=1
 			
 			dockers=${NTYPE}_DOCKERS_CHECK[@]
@@ -188,8 +204,8 @@ STATUS(){
 							[ "${NTYPE}" != "OFW" ] && srvctst=(`${NCMD} "systemctl is-active ${srvcstotest}"`)
 							sr=0
 							for srvc in "${!srvcs}"; do
-								[ "${srvc}" == "gitea" ] && [ "${NTYPE}" == "WEB" ] && [[ $($NCMD ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['WEB']}* ]] && NOGOCHK=false || NOGOCHK=true
-								[ "${srvc}" == "headscale" ] && [ "${NTYPE}" == "HS" ] && [[ $($NCMD ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['HS']}* ]] && NOGOCHK=false
+								[ "${srvc}" == "gitea" ] && [ "${NTYPE}" == "WEB" ] && [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['WEB']}* ]] && NOGOCHK=false || NOGOCHK=true
+								[ "${srvc}" == "headscale" ] && [ "${NTYPE}" == "HS" ] && [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['HS']}* ]] && NOGOCHK=false
 								[ "${srvc}" == "keepalived" ] && ([ "${nip}" == "10.2.1.2" ] || [ "${nip}" == "10.2.1.51" ]) && NOGOCHK=false
 								if [ ${NOGOCHK} == true ]; then
 									if [ "${ST_ACTION}" != "check" ]; then
@@ -265,7 +281,7 @@ STATUS(){
 							
 							# for srvc in "${!var2}"; do
 							# 	NOGOCHK=true;
-							# 	[ "${srvc}" == "gitea" ] && [ "${NTYPE}" == "WEB" ] && [[ $($NCMD ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${WEB_HOSTS[0]}* ]] && NOGOCHK=false;
+							# 	[ "${srvc}" == "gitea" ] && [ "${NTYPE}" == "WEB" ] && [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${WEB_HOSTS[0]}* ]] && NOGOCHK=false;
 							# 	if [ ${NOGOCHK} = true ]; then
 							# 		if [ "${ST_ACTION}" != "check" ]; then
 							# 			if [ "${ST_ACTION}" != "report" ]; then
@@ -352,7 +368,7 @@ STATUS(){
 							fi
 							for docker in "${!dockers}"; do
 								if [ "${NTYPE}" == "WEB" ]; then
-									([ "${docker}" == "vaultwarden" ] || [ "${docker}" == "heimdall" ] || [ "${docker}" == "authelia" ]) && [[ $($NCMD ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['WEB']}* ]] && NOGOCHK=false || NOGOCHK=true
+									([ "${docker}" == "vaultwarden" ] || [ "${docker}" == "heimdall" ] || [ "${docker}" == "authelia" ]) && [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['WEB']}* ]] && NOGOCHK=false || NOGOCHK=true
 								else
 									NOGOCHK=true
 								fi