From bf3c4df21577be2d7ebffb58c71574f9a9d77b34 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 1 Feb 2019 20:21:28 -0600 Subject: [PATCH] Update nodemgmt-scripts.sh --- nodemgmt-scripts.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 69e0acd5..d7d15609 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -63,6 +63,7 @@ case "$1" in rm -rf /etc/letsencrypt/archive/${DEL_SITE} rm -rf /etc/letsencrypt/live/${DEL_SITE} rm -f /etc/letsencrypt/renewal/${DEL_SITE}.conf + echo -e "${idsCL[LightGreen]}Waiting for node replication...${idsCL[Default]}" sleep 20 ${FOLDER}/nodemgmt-scripts.sh service nginx reload echo -e "${idsCL[LightRed]}Site has been deleted.${idsCL[Default]}" @@ -107,7 +108,7 @@ case "$1" in echo -e "server { listen 8080;" > /etc/nginx/sites-available/${NEW_SITE}.conf if [ "${CREATE_SSL}" = "true" ]; then - echo -e " listen 8443 ssl http2;" > /etc/nginx/sites-available/${NEW_SITE}.conf + echo -e " listen 8443 ssl http2;" >> /etc/nginx/sites-available/${NEW_SITE}.conf fi echo -e " server_name ${NEW_SITE}; @@ -145,7 +146,15 @@ case "$1" in fi echo -e "}" >> /etc/nginx/sites-available/${NEW_SITE}.conf - mkdir -p /var/www/${NEW_SITE}/{public_folder,nginx_logs} + nid=1 + for nip in "${NODE_HOSTS[@]}" + do + if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD='' + else NCMD="ssh root@${nip}" + fi + ${NCMD} mkdir -p /var/www/${NEW_SITE}/{public_folder,nginx_logs} + nid=`expr $nid + 1` + done echo "Site folders have been created." echo -e "${idsCL[LightGreen]}Waiting for folder replication between the nodes...${idsCL[Default]}" sleep 20 @@ -186,6 +195,8 @@ case "$1" in ln -s /etc/nginx/sites-available/${NEW_SITE}.conf /etc/nginx/sites-enabled/${NEW_SITE}.conf if [ "${CREATE_SSL}" = "true" ]; then ${FOLDER}/nodemgmt-scripts.sh newcert ${NEW_SITE} + else + ${FOLDER}/nodemgmt-scripts.sh service nginx reload fi echo "" echo -e "${idsCL[LightGreen]}The new site for '${idsCL[LightGreen]}${NEW_SITE}${idsCL[Default]}' has been created.${idsCL[Default]}"