diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 24568283..7760208d 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -441,31 +441,7 @@ DEL-SSL(){ rm -f /etc/letsencrypt/renewal/${DEL_SSL}.conf echo -e "${idsCL[Green]}OK${idsCL[Default]}" echo "" - - # echo -en "${idsCL[LightYellow]}Waiting for certificate replication between the nodes... ${idsCL[Default]}" - # checked=false - # timeout=`date --date='2 minutes' +%s` - # 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 - # if ${NCMD} "[ -d /etc/letsencrypt/live/${DEL_SSL} ]"; then - # tchecked+=false - # else - # tchecked+='' - # fi - # fi - # done - # checked=${tchecked} - # if [ "`date +%s`" -gt "$timeout" ]; then - # echo -e "${idsCL[Red]}Timeout${idsCL[Default]}" - # timeout=true - # break - # fi - # done + else echo -e "${idsCL[LightRed]}The SSL files folder for '${idsCL[Red]}${DEL_SSL}${idsCL[LightRed]}' could not be found.${idsCL[Default]}" @@ -490,34 +466,7 @@ CERTRENEW(){ daterun=`date +%Y-%m-%d-%H-%M-%S` echo -e "${daterun}" >> /etc/letsencrypt/cert-renewal.lastrun DIVIDER true - echo -en "${idsCL[LightYellow]}Waiting for certificate replication between the nodes... ${idsCL[Default]}" - checked=false - timeout=`date --date='2 minutes' +%s` - until [ "${checked}" = "" ]; do - tchecked='' - 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='' - 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} - if [ "`date +%s`" -gt "$timeout" ]; then - echo -e "${idsCL[Red]}Timeout${idsCL[Default]}" - timeout=true - break - fi - done - if [ "${timeout}" != "true" ]; then - echo -e "${idsCL[Green]}Completed${idsCL[Default]}" - fi - echo - SERVICE nginx reload ns 2>&1 | tee -a ${FOLDER}/cert-renewal.lastrun + SERVICE nginx reload 2>&1 | tee -a ${FOLDER}/cert-renewal.lastrun echo -e "${idsCL[LightGreen]}The certificates have been renewed.${idsCL[Default]}" echo "" if [ -z $action ] || [ "${action}" = "gui" ]; then @@ -533,25 +482,7 @@ NIGHTLYRENEW(){ yes | cp -rfH ${FOLDER}/cert-renewal.lastrun /etc/letsencrypt/cert-renewal.lastrun daterun=`date +%Y-%m-%d-%H-%M-%S` echo -e "${daterun}" >> /etc/letsencrypt/cert-renewal.lastrun - checked=false - timeout=`date --date='2 minutes' +%s` - 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` - fi - done - checked=${tchecked} - if [ "`date +%s`" -gt "$timeout" ] && [ "${STATUS_CHECK_EMAIL}" != "" ]; then - if [ "${STATUS_CHECK_EMAIL}" != "" ]; then echo "Timeout occurred in waiting for replication between nodes." | mail -s "Nightly-Cert-Renewal" ${STATUS_CHECK_EMAIL}; fi - break - fi - done - SERVICE nginx reload ns &>> ${FOLDER}/cert-renewal.lastrun + SERVICE nginx reload &>> ${FOLDER}/cert-renewal.lastrun } LISTCERTS(){ @@ -1026,39 +957,7 @@ NEWSITE(){ daterun=`date +%Y-%m-%d-%H-%M-%S` echo -e "${daterun}" >> /etc/nginx/new-site.lastrun DIVIDER true - echo -en "${idsCL[LightYellow]}Waiting for certificate replication between the nodes... ${idsCL[Default]}" - checked=false - timeout=`date --date='2 minutes' +%s` - until [ "${checked}" = "" ]; do - tchecked='' - 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='' - 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} - if [ "`date +%s`" -gt "$timeout" ]; then - echo -e "${idsCL[Red]}Timeout${idsCL[Default]}" - timeout=true - if [ "${STATUS_CHECK_EMAIL}" != "" ]; then - echo "Timeout occurred in waiting for replication between nodes." | mail -s "Status-Check" ${STATUS_CHECK_EMAIL} - fi - break - fi - done - if [ "${timeout}" != "true" ]; then - echo -e "${idsCL[Green]}Completed${idsCL[Default]}" - fi - echo - - SERVICE nginx reload ns + SERVICE nginx reload echo "" echo -e "${idsCL[LightGreen]}The new site for '${idsCL[LightGreen]}${NEW_SITE}${idsCL[Default]}' has been created.${idsCL[Default]}" echo "" @@ -1278,7 +1177,7 @@ SERVICE(){ if [ "${2}" = "restart" ] || [ "${2}" = "reload" ]; then if [ "${3}" != "ns" ]; then if [ "${3}" != "q" ]; then - echo -en "${idsCL[LightYellow]}Waiting for nginx config replication across the nodes... ${idsCL[Default]}" + echo -en "${idsCL[LightYellow]}Verifying nginx config and ssl cert replication across the nodes... ${idsCL[Default]}" fi PH_CMD="ssh root@${WEB_HOSTS[0]}" ${PH_CMD} "echo -e \"Service ${1} ${2}\" > /etc/nginx/test.repl"