From 4029051f3591965d36acb46d2693859b3468a687 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 3 Jul 2023 23:39:07 -0500
Subject: [PATCH] update

---
 defaults.inc       | 50 ++++++++++++++++++++++++++++++++--------------
 defaults.local.inc | 28 ++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 879a582b..a4f847da 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 
-VERS='4.7.170-07032023'
+VERS='4.8.1-07032023'
 
 noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns '
 CERT_DAEMON='/snap/bin/certbot'
@@ -31,22 +31,14 @@ if [ -f ${FOLDER}/defaults.local.inc ]; then
 	declare -A NM_DOCKER_COMPOSE_LOC
 	declare -A NM_REPL_CHECK_LOC
 	declare -A NM_REPL_DESC
-	
+	declare -A NM_SINGLESRVR_SERVICES
+	declare -A NM_SINGLESRVR_DOCKERS
+	declare -A NM_SINGLESRVR_IP
 	
 	source ${FOLDER}/defaults.local.inc
 
 	IFS=,
-	
 	LOCAL_SERVICES=(${LOCAL_SERVICES})
-
-	WEB_DOCKER=(${WEBDOCKER})
-	LB_DOCKER=(${LBDOCKER})
-	WM_DOCKER=(${WMDOCKER})
-	PW_DOCKER=(${PWDOCKER})
-
-	WEB_SINGLESRVR_SERVICES=(${WEB_SINGLESRVRSERVICES})
-	WEB_SINGLESRVR_DOCKERS=(${WEB_SINGLESRVRDOCKERS})
-	
 	unset IFS
 	
 	declare -a NODE_TYPES
@@ -59,6 +51,9 @@ if [ -f ${FOLDER}/defaults.local.inc ]; then
 		arr ${ntype}_SERVICES_CHECK
 		arr ${ntype}_DOCKERS_CHECK
 		arr ${ntype}_REPL_CHECK
+		arr ${ntype}_SINGLESRVR_SERVICES
+		arr ${ntype}_SINGLESRVR_DOCKERS
+		arr ${ntype}_SINGLESRVR_IP
 		
 		IFS=,; var=(${NM_HOSTS[${ntype}]}); unset IFS
 		for value in "${var[@]}"; do
@@ -89,12 +84,37 @@ if [ -f ${FOLDER}/defaults.local.inc ]; then
 				arr_insert ${ntype}_REPL_CHECK $value
 			done
 		else
-			declare "${ntype}_DOCKERS_CHECK"=""
+			declare "${ntype}_REPL_CHECK"=""
+		fi
+		
+		if [ "${NM_SINGLESRVR_SERVICES[${ntype}]}" != "" ]; then
+			IFS=,; var=(${NM_SINGLESRVR_SERVICES[${ntype}]}); unset IFS
+			for value in "${var[@]}"; do
+				arr_insert ${ntype}_SINGLESRVR_SERVICES $value
+			done
+		else
+			declare "${ntype}_SINGLESRVR_SERVICES"=""
+		fi
+		
+		if [ "${NM_SINGLESRVR_DOCKERS[${ntype}]}" != "" ]; then
+			IFS=,; var=(${NM_SINGLESRVR_DOCKERS[${ntype}]}); unset IFS
+			for value in "${var[@]}"; do
+				arr_insert ${ntype}_SINGLESRVR_DOCKERS $value
+			done
+		else
+			declare "${ntype}_SINGLESRVR_DOCKERS"=""
+		fi
+		
+		if [ "${NM_SINGLESRVR_IP[${ntype}]}" != "" ]; then
+			IFS=,; var=(${NM_SINGLESRVR_IP[${ntype}]}); unset IFS
+			for value in "${var[@]}"; do
+				arr_insert ${ntype}_SINGLESRVR_IP $value
+			done
+		else
+			declare "${ntype}_SINGLESRVR_IP"=""
 		fi
 	done
 	
-	
-	
 fi
 
 declare -A NM_SRVCOPTS
diff --git a/defaults.local.inc b/defaults.local.inc
index 4a850eff..80858bdf 100755
--- a/defaults.local.inc
+++ b/defaults.local.inc
@@ -52,7 +52,35 @@ NM_REPL_CHECK['WPD']=
 NM_REPL_CHECK['WM']=
 NM_REPL_CHECK['WEB']=web-data
 
+NM_SINGLESRVR_SERVICES['LB']=
+NM_SINGLESRVR_SERVICES['LPD']=
+NM_SINGLESRVR_SERVICES['MM']=
+NM_SINGLESRVR_SERVICES['MYSQL']=
+NM_SINGLESRVR_SERVICES['NC']=
+NM_SINGLESRVR_SERVICES['PW']=
+NM_SINGLESRVR_SERVICES['WPD']=
+NM_SINGLESRVR_SERVICES['WM']=
+NM_SINGLESRVR_SERVICES['WEB']=gitea
 
+NM_SINGLESRVR_DOCKERS['LB']=
+NM_SINGLESRVR_DOCKERS['LPD']=
+NM_SINGLESRVR_DOCKERS['MM']=
+NM_SINGLESRVR_DOCKERS['MYSQL']=
+NM_SINGLESRVR_DOCKERS['NC']=
+NM_SINGLESRVR_DOCKERS['PW']=
+NM_SINGLESRVR_DOCKERS['WPD']=
+NM_SINGLESRVR_DOCKERS['WM']=
+NM_SINGLESRVR_DOCKERS['WEB']=vaultwarden,heimdall,authelia
+
+NM_SINGLESRVR_IP['LB']=
+NM_SINGLESRVR_IP['LPD']=
+NM_SINGLESRVR_IP['MM']=
+NM_SINGLESRVR_IP['MYSQL']=
+NM_SINGLESRVR_IP['NC']=
+NM_SINGLESRVR_IP['PW']=
+NM_SINGLESRVR_IP['WPD']=
+NM_SINGLESRVR_IP['WM']=
+NM_SINGLESRVR_IP['WEB']=10.10.1.20
 
 
 WEB_SINGLESRVRSERVICES=gitea