From e71c2b1d096b19f563e59f5412808d64e9adaa5f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 28 Apr 2023 22:35:48 -0500 Subject: [PATCH] update --- defaults.inc | 6 +++--- nodemgmt-scripts.sh | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/defaults.inc b/defaults.inc index 0c6e26a3..40513eac 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,9 +1,9 @@ #!/usr/bin/env bash -VERS='4.5.15-04262023' +VERS='4.5.17-04262023' -NODETYPES=WEB -# NODETYPES=MYSQL,LB,WEB,NC,WPD,LPD,MM,PW +# NODETYPES=WEB +NODETYPES=MYSQL,LB,WEB,NC,WPD,LPD,MM,PW MYSQLHOSTS=10.10.1.51,10.10.1.52 WEBHOSTS=10.10.1.121,10.10.1.122 LBHOSTS=10.10.10.81,10.10.10.82 diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 1b9d083b..a9d5f6de 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -175,9 +175,7 @@ STATUS(){ if [ "${ST_ACTION}" != "dockers" ]; then srvcs=${NTYPE}_SERVICES_CHECK[@]; srvcstotest="$(join_by " " ${!srvcs})" - srvctst=(`${NCMD} systemctl is-active ${srvcstotest}`) - echo -e "${srvcstotest}\n`${NCMD} systemctl is-active ${srvcstotest}`" sr=0 for srvc in "${!srvcs}"; do [ "${srvc}" == "gitea" ] && [ "${NTYPE}" == "WEB" ] && [[ $($NCMD /sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *${WEB_HOSTS[0]}* ]] && NOGOCHK=false || NOGOCHK=true