From d02c6ccf36bbcc0b4927ece6b562c6f2dd129cc1 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 3 Jul 2023 22:35:13 -0500 Subject: [PATCH] Update defaults.inc --- defaults.inc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/defaults.inc b/defaults.inc index 1765eafa..2b9ed80b 100755 --- a/defaults.inc +++ b/defaults.inc @@ -23,6 +23,16 @@ if [ -f ${FOLDER}/defaults.local.inc ]; then IFS=, + MYSQL_SERVICES_CHECK=(${MYSQLSERVICES_CHECK}) + WEB_SERVICES_CHECK=(${WEBSERVICES_CHECK}) + LB_SERVICES_CHECK=(${LBSERVICES_CHECK}) + NC_SERVICES_CHECK=(${NCSERVICES_CHECK}) + WPD_SERVICES_CHECK=(${WPDSERVICES_CHECK}) + LPD_SERVICES_CHECK=(${LPDSERVICES_CHECK}) + MM_SERVICES_CHECK=(${MMSERVICES_CHECK}) + PW_SERVICES_CHECK=(${PWSERVICES_CHECK}) + WM_SERVICES_CHECK=(${WMSERVICES_CHECK}) + LOCAL_SERVICES=(${LOCAL_SERVICES}) WEB_DOCKER=(${WEBDOCKER}) @@ -33,7 +43,7 @@ if [ -f ${FOLDER}/defaults.local.inc ]; then WEB_SINGLESRVR_SERVICES=(${WEB_SINGLESRVRSERVICES}) WEB_SINGLESRVR_DOCKERS=(${WEB_SINGLESRVRDOCKERS}) - + unset IFS declare -a NODE_TYPES for nmtype in "${!NM_HOSTS[@]}"; do @@ -44,20 +54,18 @@ if [ -f ${FOLDER}/defaults.local.inc ]; then arr ${ntype}_HOSTS arr ${ntype}_SERVICES_CHECK - var=(${NM_HOSTS[${ntype}]}) + IFS=,; var=(${NM_HOSTS[${ntype}]}); unset IFS for value in "${var[@]}"; do arr_insert ${ntype}_HOSTS $value done - var=(${NM_SERVICES_CHECK[${ntype}]}) + IFS=,; var=(${NM_SERVICES_CHECK[${ntype}]}); unset IFS for value in "${var[@]}"; do arr_insert ${ntype}_SERVICES_CHECK $value done done - unset IFS - fi