From b7a47d88f3b6e09abfd2f3075715a5cc697995c6 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 3 Jul 2023 23:52:17 -0500 Subject: [PATCH] update --- defaults.local.inc | 16 ++++++++-------- inc/certs.inc | 1 + inc/sites.inc | 1 + inc/status.inc | 3 ++- nodemgmt-scripts.sh | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/defaults.local.inc b/defaults.local.inc index 2689978b..f1a19c7b 100755 --- a/defaults.local.inc +++ b/defaults.local.inc @@ -12,15 +12,15 @@ NM_NODEMANAGER=10.10.10.50 # NM_NEW_ARRAY['WEB']= # NM_HOSTS['GL']=10.10.1.41,10.10.1.42,10.10.1.121,10.10.1.122 -NM_HOSTS['LB']=10.10.10.81,10.10.10.82 -NM_HOSTS['LPD']=10.10.10.10,10.10.10.11,10.2.1.2 +# NM_HOSTS['LB']=10.10.10.81,10.10.10.82 +# NM_HOSTS['LPD']=10.10.10.10,10.10.10.11,10.2.1.2 NM_HOSTS['MM']=10.10.1.24 -NM_HOSTS['MYSQL']=10.10.1.51,10.10.1.52 -NM_HOSTS['NC']=10.10.10.42 -NM_HOSTS['PW']=10.10.0.240 -NM_HOSTS['WPD']=100.100.55.2,100.100.55.3,10.10.1.28 -NM_HOSTS['WM']=100.100.55.5 -NM_HOSTS['WEB']=10.10.1.121,10.10.1.122 +# NM_HOSTS['MYSQL']=10.10.1.51,10.10.1.52 +# NM_HOSTS['NC']=10.10.10.42 +# NM_HOSTS['PW']=10.10.0.240 +# NM_HOSTS['WPD']=100.100.55.2,100.100.55.3,10.10.1.28 +# NM_HOSTS['WM']=100.100.55.5 +# NM_HOSTS['WEB']=10.10.1.121,10.10.1.122 NM_SERVICES_CHECK['LB']=nginx,haproxy,keepalived NM_SERVICES_CHECK['LPD']=pdns,nginx,mariadb,pdnsadmin,pdnsadmin.socket,keepalived diff --git a/inc/certs.inc b/inc/certs.inc index bce38118..6c94117c 100755 --- a/inc/certs.inc +++ b/inc/certs.inc @@ -1,3 +1,4 @@ +#!/usr/bin/env bash NEWCERT(){ echo if [ -z ${1+x} ]; then diff --git a/inc/sites.inc b/inc/sites.inc index cef7bb04..731b07d5 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -1,3 +1,4 @@ +#!/usr/bin/env bash DELSITE(){ while [ $# -gt 0 ]; do case "$1" in diff --git a/inc/status.inc b/inc/status.inc index 85d92b31..427da348 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -1,3 +1,4 @@ +#!/usr/bin/env bash STATUS(){ start=`date +%s` ST_ACTION=${1} @@ -68,7 +69,7 @@ STATUS(){ else spc=' ' fi - echo -en " ${NM_SERVICE_DESC[${srvc}]}${spc}: " + echo -en " ${NM_SERVICE_DESC[${srvc}]}(${srvc})${spc}: " fi if [ "$(systemctl is-active ${srvc})" != "active" ]; then diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 87dd5fbd..213b73ba 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# NodeMgmt - Galera/NGINX Node Management Scripts +# NodeMgmt - Node Management Scripts action="$1"