From 99cecddad6c67487850317f2bcdb4adb80997687 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Thu, 25 Jul 2019 21:15:31 -0500
Subject: [PATCH] Update nodemgmt-scripts.sh

---
 nodemgmt-scripts.sh | 92 +++++++++++++++++++++++++++------------------
 1 file changed, 56 insertions(+), 36 deletions(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 6d9d517b..fd5aa2c4 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -395,11 +395,14 @@ NEWCERT(){
 				until [ "${checked}" = "" ]; do
 					tchecked=''
 					for nip in "${WEB_HOSTS[@]}"; do
-						if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''
-							else NCMD="ssh root@${nip}"
-						fi
-						if [ "${NCMD}" != "" ]; then
-							tchecked+=`${NCMD} "cat /etc/letsencrypt/cert-request.lastrun" | diff - /etc/letsencrypt/cert-request.lastrun`
+						checkhost=$(CHECK_HOST ${nip})
+						if [ "${checkhost}" != "false" ]; then
+							if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''
+								else NCMD="ssh root@${nip}"
+							fi
+							if [ "${NCMD}" != "" ]; then
+								tchecked+=`${NCMD} "cat /etc/letsencrypt/cert-request.lastrun" | diff - /etc/letsencrypt/cert-request.lastrun`
+							fi
 						fi
 					done
 					checked=${tchecked}
@@ -520,11 +523,14 @@ CERTRENEW(){
 	until [ "${checked}" = "" ]; do
 		tchecked=''
 		for nip in "${WEB_HOSTS[@]}"; do
-			if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''
-				else NCMD="ssh root@${nip}"
-			fi
-			if [ "${NCMD}" != "" ]; then
-				tchecked+=`${NCMD} "cat /etc/letsencrypt/cert-renewal.lastrun" | diff - /etc/letsencrypt/cert-renewal.lastrun`
+			checkhost=$(CHECK_HOST ${nip})
+			if [ "${checkhost}" != "false" ]; then
+				if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''
+					else NCMD="ssh root@${nip}"
+				fi
+				if [ "${NCMD}" != "" ]; then
+					tchecked+=`${NCMD} "cat /etc/letsencrypt/cert-renewal.lastrun" | diff - /etc/letsencrypt/cert-renewal.lastrun`
+				fi
 			fi
 		done
 		checked=${tchecked}
@@ -975,11 +981,14 @@ NEWSITE(){
 				mkdir -p /var/www/${MAIN_SITE}/{public_html,nginx_logs}
 				echo -en "${idsCL[LightYellow]}Waiting for folder replication across the webserver nodes... ${idsCL[Default]}"
 				for nip in "${WEB_HOSTS[@]}"; do
-					if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]]; then
-						checked=false
-						until [ "${checked}" = "" ]; do
-							checked=`ssh root@${nip} "[ ! -d /var/www/${MAIN_SITE} ] && echo does not exist"`
-						done
+					checkhost=$(CHECK_HOST ${nip})
+					if [ "${checkhost}" != "false" ]; then
+						if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]]; then
+							checked=false
+							until [ "${checked}" = "" ]; do
+								checked=`ssh root@${nip} "[ ! -d /var/www/${MAIN_SITE} ] && echo does not exist"`
+							done
+						fi
 					fi
 				done
 				echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
@@ -1039,12 +1048,15 @@ NEWSITE(){
 			until [ "${checked}" = "" ]; do
 				tchecked=''
 				for nip in "${MYSQL_HOSTS[@]}"; do
-					if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''
-						else NCMD="ssh root@${nip}"
-					fi
-					if [ "${NCMD}" != "" ]; then
-						tchecked+=`${NCMD} "cat /etc/nginx/new-site.lastrun" | diff - /etc/nginx/new-site.lastrun`
-						tchecked+=`${NCMD} "cat /var/www/new-site.lastrun" | diff - /var/www/new-site.lastrun`
+					checkhost=$(CHECK_HOST ${nip})
+					if [ "${checkhost}" != "false" ]; then
+						if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''
+							else NCMD="ssh root@${nip}"
+						fi
+						if [ "${NCMD}" != "" ]; then
+							tchecked+=`${NCMD} "cat /etc/nginx/new-site.lastrun" | diff - /etc/nginx/new-site.lastrun`
+							tchecked+=`${NCMD} "cat /var/www/new-site.lastrun" | diff - /var/www/new-site.lastrun`
+						fi
 					fi
 				done
 				checked=${tchecked}
@@ -1275,11 +1287,14 @@ SERVICE(){
 			${PH_CMD} rm -f /etc/nginx/test.repl
 			${PH_CMD} "echo -e \"Service ${1} ${2}\" > /etc/nginx/test.repl"
 			for nip in "${WEB_HOSTS[@]}"; do
-				if [ "${nip}" != "${WEB_HOSTS[0]}" ]; then
-					checked=false
-					until [ "${checked}" = "" ]; do
-						checked="`${PH_CMD} \"ssh root@${nip} \"cat /etc/nginx/test.repl\" | diff - /etc/nginx/test.repl\"`"
-					done
+				checkhost=$(CHECK_HOST ${nip})
+				if [ "${checkhost}" != "false" ]; then
+					if [ "${nip}" != "${WEB_HOSTS[0]}" ]; then
+						checked=false
+						until [ "${checked}" = "" ]; do
+							checked="`${PH_CMD} \"ssh root@${nip} \"cat /etc/nginx/test.repl\" | diff - /etc/nginx/test.repl\"`"
+						done
+					fi
 				fi
 			done
 		fi
@@ -1307,17 +1322,22 @@ SERVICE(){
 					if [ "${3}" != "q" ]; then
 						echo -en "${NM_SRVCOPTS[${2}]}ing on ${NM_NODETYPES[$NTYPE]}-Node${nid} ($nip)... ${idsCL[Default]}"
 					fi
-					$NCMD systemctl $2 $1
-					if [ "${3}" != "q" ]; then
-						if [[ "enable,disable" = *"${2}"* ]] || [ "${1}" = "daemon-reload" ]; then
-							echo -e "${idsCL[Green]}OK${idsCL[Default]}"
-						elif [ "$(${NCMD} systemctl is-active ${1})" = "active" ]; then
-							echo -e "${idsCL[Green]}OK${idsCL[Default]}"
-						elif [ "$2" = "stop" ]; then
-							echo -e "${idsCL[Red]}STOPPED${idsCL[Default]}"
-						else
-							echo -e "${idsCL[Red]}ERROR${idsCL[Default]}"
+					checkhost=$(CHECK_HOST ${nip})
+					if [ "${checkhost}" != "false" ]; then
+						$NCMD systemctl $2 $1
+						if [ "${3}" != "q" ]; then
+							if [[ "enable,disable" = *"${2}"* ]] || [ "${1}" = "daemon-reload" ]; then
+								echo -e "${idsCL[Green]}OK${idsCL[Default]}"
+							elif [ "$(${NCMD} systemctl is-active ${1})" = "active" ]; then
+								echo -e "${idsCL[Green]}OK${idsCL[Default]}"
+							elif [ "$2" = "stop" ]; then
+								echo -e "${idsCL[Red]}STOPPED${idsCL[Default]}"
+							else
+								echo -e "${idsCL[Red]}ERROR${idsCL[Default]}"
+							fi
 						fi
+					else
+						echo -e "${idsCL[Red]}Node is Down${idsCL[Default]}"
 					fi
 				# fi
 				nid=`expr $nid + 1`