Update nodemgmt-scripts.sh

This commit is contained in:
2019-07-25 21:15:31 -05:00
parent 2bc68c883f
commit 99cecddad6

View File

@@ -395,12 +395,15 @@ NEWCERT(){
until [ "${checked}" = "" ]; do until [ "${checked}" = "" ]; do
tchecked='' tchecked=''
for nip in "${WEB_HOSTS[@]}"; do 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 NCMD='' if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''
else NCMD="ssh root@${nip}" else NCMD="ssh root@${nip}"
fi fi
if [ "${NCMD}" != "" ]; then if [ "${NCMD}" != "" ]; then
tchecked+=`${NCMD} "cat /etc/letsencrypt/cert-request.lastrun" | diff - /etc/letsencrypt/cert-request.lastrun` tchecked+=`${NCMD} "cat /etc/letsencrypt/cert-request.lastrun" | diff - /etc/letsencrypt/cert-request.lastrun`
fi fi
fi
done done
checked=${tchecked} checked=${tchecked}
if [ "`date +%s`" -gt "$timeout" ]; then if [ "`date +%s`" -gt "$timeout" ]; then
@@ -520,12 +523,15 @@ CERTRENEW(){
until [ "${checked}" = "" ]; do until [ "${checked}" = "" ]; do
tchecked='' tchecked=''
for nip in "${WEB_HOSTS[@]}"; do 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 NCMD='' if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''
else NCMD="ssh root@${nip}" else NCMD="ssh root@${nip}"
fi fi
if [ "${NCMD}" != "" ]; then if [ "${NCMD}" != "" ]; then
tchecked+=`${NCMD} "cat /etc/letsencrypt/cert-renewal.lastrun" | diff - /etc/letsencrypt/cert-renewal.lastrun` tchecked+=`${NCMD} "cat /etc/letsencrypt/cert-renewal.lastrun" | diff - /etc/letsencrypt/cert-renewal.lastrun`
fi fi
fi
done done
checked=${tchecked} checked=${tchecked}
if [ "`date +%s`" -gt "$timeout" ]; then if [ "`date +%s`" -gt "$timeout" ]; then
@@ -975,12 +981,15 @@ NEWSITE(){
mkdir -p /var/www/${MAIN_SITE}/{public_html,nginx_logs} mkdir -p /var/www/${MAIN_SITE}/{public_html,nginx_logs}
echo -en "${idsCL[LightYellow]}Waiting for folder replication across the webserver nodes... ${idsCL[Default]}" echo -en "${idsCL[LightYellow]}Waiting for folder replication across the webserver nodes... ${idsCL[Default]}"
for nip in "${WEB_HOSTS[@]}"; do 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 if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]]; then
checked=false checked=false
until [ "${checked}" = "" ]; do until [ "${checked}" = "" ]; do
checked=`ssh root@${nip} "[ ! -d /var/www/${MAIN_SITE} ] && echo does not exist"` checked=`ssh root@${nip} "[ ! -d /var/www/${MAIN_SITE} ] && echo does not exist"`
done done
fi fi
fi
done done
echo -e "${idsCL[Green]}Completed${idsCL[Default]}" echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
@@ -1039,6 +1048,8 @@ NEWSITE(){
until [ "${checked}" = "" ]; do until [ "${checked}" = "" ]; do
tchecked='' tchecked=''
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 NCMD='' if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''
else NCMD="ssh root@${nip}" else NCMD="ssh root@${nip}"
fi fi
@@ -1046,6 +1057,7 @@ NEWSITE(){
tchecked+=`${NCMD} "cat /etc/nginx/new-site.lastrun" | diff - /etc/nginx/new-site.lastrun` 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` tchecked+=`${NCMD} "cat /var/www/new-site.lastrun" | diff - /var/www/new-site.lastrun`
fi fi
fi
done done
checked=${tchecked} checked=${tchecked}
if [ "`date +%s`" -gt "$timeout" ]; then if [ "`date +%s`" -gt "$timeout" ]; then
@@ -1275,12 +1287,15 @@ SERVICE(){
${PH_CMD} rm -f /etc/nginx/test.repl ${PH_CMD} rm -f /etc/nginx/test.repl
${PH_CMD} "echo -e \"Service ${1} ${2}\" > /etc/nginx/test.repl" ${PH_CMD} "echo -e \"Service ${1} ${2}\" > /etc/nginx/test.repl"
for nip in "${WEB_HOSTS[@]}"; do for nip in "${WEB_HOSTS[@]}"; do
checkhost=$(CHECK_HOST ${nip})
if [ "${checkhost}" != "false" ]; then
if [ "${nip}" != "${WEB_HOSTS[0]}" ]; then if [ "${nip}" != "${WEB_HOSTS[0]}" ]; then
checked=false checked=false
until [ "${checked}" = "" ]; do until [ "${checked}" = "" ]; do
checked="`${PH_CMD} \"ssh root@${nip} \"cat /etc/nginx/test.repl\" | diff - /etc/nginx/test.repl\"`" checked="`${PH_CMD} \"ssh root@${nip} \"cat /etc/nginx/test.repl\" | diff - /etc/nginx/test.repl\"`"
done done
fi fi
fi
done done
fi fi
fi fi
@@ -1307,6 +1322,8 @@ SERVICE(){
if [ "${3}" != "q" ]; then if [ "${3}" != "q" ]; then
echo -en "${NM_SRVCOPTS[${2}]}ing on ${NM_NODETYPES[$NTYPE]}-Node${nid} ($nip)... ${idsCL[Default]}" echo -en "${NM_SRVCOPTS[${2}]}ing on ${NM_NODETYPES[$NTYPE]}-Node${nid} ($nip)... ${idsCL[Default]}"
fi fi
checkhost=$(CHECK_HOST ${nip})
if [ "${checkhost}" != "false" ]; then
$NCMD systemctl $2 $1 $NCMD systemctl $2 $1
if [ "${3}" != "q" ]; then if [ "${3}" != "q" ]; then
if [[ "enable,disable" = *"${2}"* ]] || [ "${1}" = "daemon-reload" ]; then if [[ "enable,disable" = *"${2}"* ]] || [ "${1}" = "daemon-reload" ]; then
@@ -1319,6 +1336,9 @@ SERVICE(){
echo -e "${idsCL[Red]}ERROR${idsCL[Default]}" echo -e "${idsCL[Red]}ERROR${idsCL[Default]}"
fi fi
fi fi
else
echo -e "${idsCL[Red]}Node is Down${idsCL[Default]}"
fi
# fi # fi
nid=`expr $nid + 1` nid=`expr $nid + 1`
done done