diff --git a/defaults.inc b/defaults.inc index 9faf5fb0..52243089 100755 --- a/defaults.inc +++ b/defaults.inc @@ -4,6 +4,7 @@ VERS='3.02112019' NODEHOSTS=10.5.10.51,10.5.10.52,10.5.10.53 PRIMARYHOST=10.5.10.51 NODESERVICES=mysql,nginx,gitea,powerdns-admin,haproxy,keepalived,maxscale +NODESERVICES_CHECK=mysql,nginx,gitea,haproxy,keepalived,maxscale noheader=' service status-check nightlyrenew backup report check checkcerts ' CERT_DAEMON='/usr/bin/certbot' FOLDER=/opt/idssys/nodemgmt @@ -15,6 +16,7 @@ declare -i errtime IFS=, NODE_HOSTS=(${NODEHOSTS}) NODE_SERVICES=(${NODESERVICES}) +NODE_SERVICES_CHECK=(${NODESERVICES_CHECK}) LOCAL_SERVICES=(${LOCAL_SERVICES}) unset IFS diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 94a36823..66439505 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -141,8 +141,7 @@ STATUS(){ rm -f ${FOLDER}/${nip}.down; rm -f ${FOLDER}/${nip}.errtime echo "iDS-Node${nid} is back UP! It was down for $(SHOW_TIME ${toterrtime})" | mail -s "iDS-Node${nid}-${nip}-UP" ${STATUS_CHECK_EMAIL} fi - declare -p NODE_SERVICES - for srvc in "${NODE_SERVICES[@]}"; do + for srvc in "${NODE_SERVICES_CHECK[@]}"; do if [ "${ST_ACTION}" != "check" ]; then c=0; cw=22; spc='' spc1=${cw}-${#NM_SERVICES[${srvc}]} @@ -339,7 +338,7 @@ STATUS(){ # if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD='' # else NCMD="ssh root@${nip}" # fi -# for srvc in "${NODE_SERVICES[@]}"; do +# for srvc in "${NODE_SERVICES_CHECK[@]}"; do # if [ "$(${NCMD} systemctl is-active ${srvc})" != "active" ]; then # if [ ! -f ${FOLDER}/${nip}-${srvc}.down ]; then # echo "${NM_SERVICES[${srvc}]} is down" | mail -s "iDS-Node${nid}-${nip}" ${STATUS_CHECK_EMAIL}