From 9e43568c66dbb0312151d2cf8165d3664951675a Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 2 Dec 2023 13:38:57 -0600
Subject: [PATCH] update

---
 defaults.inc  |  2 +-
 inc/sites.inc | 44 ++++++++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index a1a21692..5dcd6124 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERS='4.16.18-11292023'
+VERS='4.16.19-12022023'
 
 noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log '
 CERT_DAEMON='/snap/bin/certbot'
diff --git a/inc/sites.inc b/inc/sites.inc
index 2e1761d8..914e239e 100755
--- a/inc/sites.inc
+++ b/inc/sites.inc
@@ -346,27 +346,23 @@ NEWSITE(){
 			# 	NEWCERT ${NEW_SITE} newsite ${CERTTEST}
 			# fi
 			
-			# daterun=`date +%Y-%m-%d-%H-%M-%S`
-			# echo -e "${NEW_SITE}\n${daterun}" >| ${NM_LOGFOLDER}/new-site.lastrun
-			# # yes | cp -rfH ${NM_LOGFOLDER}/new-site.lastrun ${NM_NGINXPATH}/new-site.lastrun
-			# # yes | cp -rfH ${NM_LOGFOLDER}/new-site.lastrun ${NM_WWWPATH}/new-site.lastrun
-			# # daterun=`date +%Y-%m-%d-%H-%M-%S`
-			# # echo -e "${daterun}" >> ${NM_NGINXPATH}/new-site.lastrun
-			# DIVIDER true
-			# echo
-			# echo -e "${idsCL[LightGreen]}The new site for '${idsCL[LightGreen]}${NEW_SITE}${idsCL[Default]}' has been created.${idsCL[Default]}"
-			# echo
-			# if [ ! -f ${NM_NGINXPATH}/sites-enabled/default* ]; then
-			# 	echo -en "${idsCL[LightCyan]}Restart NGINX on all Nodes (Y/n): ${idsCL[Default]}"
-			# 	read -n 1 NGINXRELOAD
-			# 	if [[ ${NGINXRELOAD} =~ ^[Nn]$ ]]; then
-			# 		echo
-			# 	else
-			# 		SERVICE_MGMT nginx restart
-			# 	fi
-			# else
-			# 	SERVICE_MGMT nginx restart
-			# fi
+			daterun=`date +%Y-%m-%d-%H-%M-%S`
+			echo -e "${NEW_SITE}\n${daterun}" >| ${NM_LOGFOLDER}/new-site.lastrun
+			DIVIDER true
+			echo
+			echo -e "${idsCL[LightGreen]}The new site for '${idsCL[LightGreen]}${NEW_SITE}${idsCL[Default]}' has been created.${idsCL[Default]}"
+			echo
+			if [ ! -f ${NM_NGINXPATH}/sites-enabled/default* ]; then
+				echo -en "${idsCL[LightCyan]}Restart NGINX on all Nodes (Y/n): ${idsCL[Default]}"
+				read -n 1 NGINXRELOAD
+				if [[ ${NGINXRELOAD} =~ ^[Nn]$ ]]; then
+					echo
+				else
+					SERVICE_MGMT nginx restart
+				fi
+			else
+				SERVICE_MGMT nginx restart
+			fi
 		else
 			echo "Missing proxy arguments"
 			exit 1
@@ -882,7 +878,11 @@ EDITSITE(){
 						echo -e "${idsCL[LightYellow]}${idsST[Bold]}### REQUESTING CERT IN TEST MODE ###${idsST[Reset]}${idsCL[Default]}"
 						echo 
 					fi
-					echo -en "\033[1A\033[K\r${idsCL[LightCyan]}Configuring changes ... ${idsCL[Default]}"
+					if [ "${NEWSITE}" == "true" ]; then
+						echo -en "\033[1A\033[K\r${idsCL[LightCyan]}Creating new site ... ${idsCL[Default]}"
+					else
+						echo -en "\033[1A\033[K\r${idsCL[LightCyan]}Configuring changes ... ${idsCL[Default]}"
+					fi
 					NEWPROXYSITE_CREATE ${SITENAME} ${SERVERNAMES} ${PROXYHOST} ${PROXYPORT} ${PROXYSCHEME} ${WEBSOCKET} ${HSTS} ${EXPLOITS} ${SECURE} ${SSL} ${CERTTEST} >/dev/null 2>&1
 					echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
 					echo