From eed5f4ba7642aeedf800037015991066958486b8 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Fri, 1 Feb 2019 19:57:13 -0600
Subject: [PATCH] Update nodemgmt-scripts.sh

---
 nodemgmt-scripts.sh | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 52157954..f3b70582 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -69,7 +69,6 @@ case "$1" in
 		
 	;;
 	newsite)
-		echo "NEWSITE"
 		while [ $# -gt 0 ]; do
 		    case "$1" in
 		        -site) NEW_SITE=${2};;
@@ -94,12 +93,6 @@ case "$1" in
 		    esac
 			shift
 		done
-        echo "NEW_SITE - ${NEW_SITE}"
-        echo "SITE_TYPE - ${SITE_TYPE}"
-        echo "CREATE_SSL - ${CREATE_SSL}"
-		echo "PROXYSCHEME - ${PROXYSCHEME}"
-		echo "PROXYHOST - ${PROXYHOST}"
-		echo "PROXYPORT - ${PROXYPORT}"
 		
 		if [ -z ${SITE_TYPE+x} ]; then SITE_TYPE=local; fi
 		if [ -z ${CREATE_SSL+x} ]; then CREATE_SSL=true; fi
@@ -110,8 +103,8 @@ case "$1" in
 			if [ "${GO}" = "true" ]; then
 				echo -e "${idsCL[LightGreen]}Setting up new site for '${idsCL[Yellow]}${NEW_SITE}${idsCL[LightGreen]}'...${idsCL[Default]}"
 				echo ""
-				mkdir -p /var/www/${NEW_SITE}/{public_folder,nginx_logs}
 				if [ "${SITE_TYPE}" = "local" ]; then
+					mkdir -p /var/www/${NEW_SITE}/{public_folder,nginx_logs}
 					echo -e "server {
 	listen 8443 ssl http2;
 	listen 8080;
@@ -150,7 +143,9 @@ case "$1" in
 					echo -e "	include conf.d/include/letsencrypt-acme-challenge.conf;" >> /etc/nginx/sites-available/${NEW_SITE}.conf
 				fi
 				echo -e "}" >> /etc/nginx/sites-available/${NEW_SITE}.conf
+				
 			else
+				
 				echo -e "server {
 	set \$forward_scheme ${PROXYSCHEME};
 	set \$server         \"${PROXYHOST}\";
@@ -160,8 +155,8 @@ case "$1" in
 				if [ "${CREATE_SSL}" = "true" ]; then
 					echo -e "	listen 8443 ssl http2;" >> /etc/nginx/sites-available/${NEW_SITE}.conf
 				fi
-				echo -e "	server_name ${NEW_SITE};
-" >> /etc/nginx/sites-available/${NEW_SITE}.conf
+				echo -e "
+	server_name ${NEW_SITE};" >> /etc/nginx/sites-available/${NEW_SITE}.conf
 				if [ "${CREATE_SSL}" = "true" ]; then
 					echo -e "
 	include conf.d/include/letsencrypt-acme-challenge.conf;
@@ -184,7 +179,7 @@ case "$1" in
 			ln -s /etc/nginx/sites-available/${NEW_SITE}.conf /etc/nginx/sites-enabled/${NEW_SITE}.conf
 			echo "Site folders have been created."
 			echo -e "${idsCL[LightGreen]}Waiting for folder replication between the nodes...${idsCL[Default]}"
-			sleep 20
+			sleep 30
 			nodemgmt set-permissions ${NEW_SITE}
 			if [ "${CREATE_SSL}" = "true" ]; then
 				${FOLDER}/nodemgmt-scripts.sh newcert ${NEW_SITE}