From cff213cb2da22628cfe548f4081c39817bfaac66 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 7 Feb 2019 11:01:41 -0600 Subject: [PATCH] update --- defaults.inc | 8 ++++---- nodemgmt-scripts.sh | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/defaults.inc b/defaults.inc index 506595ff..83270732 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,16 +1,16 @@ #!/usr/bin/env bash VERS='1.02052019' -NODE_HOSTS=10.5.10.51,10.5.10.52,10.5.10.53 -NODE_SERVICES=mysql,nginx,gitea,haproxy,keepalived,maxscale +NODEHOSTS=10.5.10.51,10.5.10.52,10.5.10.53 +NODESERVICES=mysql,nginx,gitea,haproxy,keepalived,maxscale REPL_CHECKS= CERT_DAEMON='/usr/bin/certbot' FOLDER=/opt/idssys/nodemgmt SCRIPT=${FOLDER}/nodemgmt-scripts.sh IFS=, -NODE_HOSTS=(${NODE_HOSTS}) -NODE_SERVICES=(${NODE_SERVICES}) +NODE_HOSTS=(${NODEHOSTS}) +NODE_SERVICES=(${NODESERVICES}) LOCAL_SERVICES=(${LOCAL_SERVICES}) unset IFS diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 9911f5fd..486e5140 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -119,6 +119,9 @@ STATUS() { STATUS-CHECK(){ if [ "${STATUS_CHECK_EMAIL}" != "" ]; then + if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) != *"${NODEHOSTS}"* ]]; then + + fi for nip in "${NODE_HOSTS[@]}"; do if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]]; then for rcheck in "${REPL_CHECK[@]}"; do