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

---
 nodemgmt-scripts.sh | 135 +++++++++++++++++++++++---------------------
 1 file changed, 71 insertions(+), 64 deletions(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index fd5aa2c4..556bb58c 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -1092,20 +1092,23 @@ NEWSITE(){
 SET-PERMISSIONS(){
 	if [ "${1}" = "gitea" ]; then
 		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 [ "${2}" != "q" ]; then
-				echo -en "${idsCL[Yellow]}Resetting folder permissions for Gitea on Webserver-Node${nid} (${nip})... ${idsCL[Default]}"
-			fi
-			${NCMD} chown -R git:git /var/lib/gitea
-			${NCMD} chmod -R 750 /var/lib/gitea
-			${NCMD} chown -R git:git /home/git
-			${NCMD} chmod -R 750 /home/git
-			if [ "${2}" != "q" ]; then
-				echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
+			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 [ "${2}" != "q" ]; then
+					echo -en "${idsCL[Yellow]}Resetting folder permissions for Gitea on Webserver-Node${nid} (${nip})... ${idsCL[Default]}"
+				fi
+				${NCMD} chown -R git:git /var/lib/gitea
+				${NCMD} chmod -R 750 /var/lib/gitea
+				${NCMD} chown -R git:git /home/git
+				${NCMD} chmod -R 750 /home/git
+				if [ "${2}" != "q" ]; then
+					echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
+				fi
 			fi
 		done
 	else
@@ -1116,62 +1119,66 @@ SET-PERMISSIONS(){
 		fi
 		if [ "${NEW_SITE}" = "xxx" ]; then
 			nid=1
-			for nip in "${MYSQL_HOSTS[@]}"
-			do
+			for nip in "${MYSQL_HOSTS[@]}"; do
+				checkhost=$(CHECK_HOST ${nip})
+				if [ "${checkhost}" != "false" ]; then
+					if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then
+						nip='localhost '
+						NCMD=''
+					else
+						NCMD="ssh root@${nip}"
+					fi
+					echo -e "${idsCL[Yellow]}Setting folder permissions for MySQL-Node${nid} (${nip})${idsCL[Default]}"
+					echo -en "${idsCL[Cyan]}LetsEncrypt Certs    ${idsCL[Default]}"
+					${NCMD} chown -R root:letsencrypt /etc/letsencrypt
+					${NCMD} chmod -R 6775 /etc/letsencrypt
+					echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
+					echo ""
+				fi
+				nid=`expr $nid + 1`
+			done
+		fi
+		nid=1
+		for nip in "${WEB_HOSTS[@]}"; do
+			checkhost=$(CHECK_HOST ${nip})
+			if [ "${checkhost}" != "false" ]; then
 				if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then
 					nip='localhost '
 					NCMD=''
 				else
 					NCMD="ssh root@${nip}"
 				fi
-				echo -e "${idsCL[Yellow]}Setting folder permissions for MySQL-Node${nid} (${nip})${idsCL[Default]}"
-				echo -en "${idsCL[Cyan]}LetsEncrypt Certs    ${idsCL[Default]}"
-				${NCMD} chown -R root:letsencrypt /etc/letsencrypt
-				${NCMD} chmod -R 6775 /etc/letsencrypt
-				echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
-				echo ""
-				nid=`expr $nid + 1`
-			done
-		fi
-		nid=1
-		for nip in "${WEB_HOSTS[@]}"
-		do
-			if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then
-				nip='localhost '
-				NCMD=''
-			else
-				NCMD="ssh root@${nip}"
-			fi
-			if [ "${NEW_SITE}" != "" ]; then
-				echo -en "${idsCL[Cyan]}Webserver-Node${nid} (${nip})    ${idsCL[Default]}"
-				${NCMD} chown -R www-data:www-data /var/www/$NEW_SITE
-				${NCMD} chmod -R 7775 /var/www/$NEW_SITE
-				${NCMD} chown -R www-data:www-data /var/lib/php/sessions
-				${NCMD} chmod -R 7777 /var/lib/php/sessions
-				echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
-			else
-				echo -e "${idsCL[Yellow]}Setting folder permissions for Webserver-Node${nid} (${nip})${idsCL[Default]}"
-				echo -en "${idsCL[Cyan]}Webserver folders    ${idsCL[Default]}"
-				${NCMD} chown -R www-data:www-data /var/www
-				${NCMD} chmod -R 7775 /var/www
-				${NCMD} chown -R www-data:www-data /var/lib/php/sessions
-				${NCMD} chmod -R 7777 /var/lib/php/sessions
-				echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
-	        	echo -en "${idsCL[Cyan]}Gitea Folder         ${idsCL[Default]}"
-				${NCMD} chown -R git:git /var/lib/gitea
-				${NCMD} chmod -R 750 /var/lib/gitea
-				${NCMD} chown -R git:git /home/git
-				${NCMD} chmod -R 750 /home/git
-				echo -e "${idsCL[Green]}Complete${idsCL[Def ault]}"
-				echo -en "${idsCL[Cyan]}LetsEncrypt Certs    ${idsCL[Default]}"
-				${NCMD} chown -R root:letsencrypt /etc/letsencrypt
-				${NCMD} chmod -R 6775 /etc/letsencrypt
-				echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
-				echo -en "${idsCL[Cyan]}PowerDNS-Admin       ${idsCL[Default]}"
-				${NCMD} chown -R www-data:www-data /opt/powerdns-admin
-				${NCMD} chmod -R 775 /opt/powerdns-admin
-				echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
-				echo ""
+				if [ "${NEW_SITE}" != "" ]; then
+					echo -en "${idsCL[Cyan]}Webserver-Node${nid} (${nip})    ${idsCL[Default]}"
+					${NCMD} chown -R www-data:www-data /var/www/$NEW_SITE
+					${NCMD} chmod -R 7775 /var/www/$NEW_SITE
+					${NCMD} chown -R www-data:www-data /var/lib/php/sessions
+					${NCMD} chmod -R 7777 /var/lib/php/sessions
+					echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
+				else
+					echo -e "${idsCL[Yellow]}Setting folder permissions for Webserver-Node${nid} (${nip})${idsCL[Default]}"
+					echo -en "${idsCL[Cyan]}Webserver folders    ${idsCL[Default]}"
+					${NCMD} chown -R www-data:www-data /var/www
+					${NCMD} chmod -R 7775 /var/www
+					${NCMD} chown -R www-data:www-data /var/lib/php/sessions
+					${NCMD} chmod -R 7777 /var/lib/php/sessions
+					echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
+		        	echo -en "${idsCL[Cyan]}Gitea Folder         ${idsCL[Default]}"
+					${NCMD} chown -R git:git /var/lib/gitea
+					${NCMD} chmod -R 750 /var/lib/gitea
+					${NCMD} chown -R git:git /home/git
+					${NCMD} chmod -R 750 /home/git
+					echo -e "${idsCL[Green]}Complete${idsCL[Def ault]}"
+					echo -en "${idsCL[Cyan]}LetsEncrypt Certs    ${idsCL[Default]}"
+					${NCMD} chown -R root:letsencrypt /etc/letsencrypt
+					${NCMD} chmod -R 6775 /etc/letsencrypt
+					echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
+					echo -en "${idsCL[Cyan]}PowerDNS-Admin       ${idsCL[Default]}"
+					${NCMD} chown -R www-data:www-data /opt/powerdns-admin
+					${NCMD} chmod -R 775 /opt/powerdns-admin
+					echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
+					echo ""
+				fi
 			fi
 			nid=`expr $nid + 1`
 		done