From 67de40c7538801d12e1e933321a38fabd1aa0027 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 11 Nov 2023 18:58:33 -0600
Subject: [PATCH] Update sites.inc

---
 inc/sites.inc | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/inc/sites.inc b/inc/sites.inc
index 0eb08ff9..14d79428 100755
--- a/inc/sites.inc
+++ b/inc/sites.inc
@@ -481,11 +481,9 @@ NEWPROXYSITE_CREATE(){
 	SECURE=${9}
 	
 	if [[ ${SERVERNAMES} == *","* ]]; then
-		echo $SERVERNAMES
+		NGINX_SERVERNAME=${SERVERNAMES}
 		IFS=','; SERVERNAMES=(${SERVERNAMES}); unset IFS
 		MAIN_SITE=${SERVERNAMES[0]}
-		NGINX_SERVERNAME=${SERVERNAMES//[,]/ }
-		echo "$MAIN_SITE - $NGINX_SERVERNAME"
 	else
 		MAIN_SITE=${SERVERNAMES}
 		NGINX_SERVERNAME=${SERVERNAMES}
@@ -498,7 +496,7 @@ NEWPROXYSITE_CREATE(){
 		[ "${MAIN_SITE}" != "${SITENAME}" ] && [ -f ${NM_NGINXPATH}/sites-enabled/${SITENAME}.conf ] && mv ${NM_NGINXPATH}/sites-enabled/${SITENAME}.conf ${nginxconfig}
 		if [ ! -f ${nginxconfig} ]; then
 			cp ${NM_FOLDER}/templates/nginx.proxy.site ${nginxconfig}
-			sed -i "s/<<SERVER_NAME>>/${SERVERNAMES//,/ }/g" ${nginxconfig}
+			sed -i "s/<<SERVER_NAME>>/${NGINX_SERVERNAME//,/ }/g" ${nginxconfig}
 			sed -i "s/<<MAIN_SITE>>/${MAIN_SITE}/g" ${nginxconfig}
 			sed -i "s/<<PROXY_IP>>/${PROXYHOST}/g" ${nginxconfig}
 			sed -i "s/<<PROXY_PORT>>/${PROXYPORT}/g" ${nginxconfig}
@@ -512,13 +510,13 @@ NEWPROXYSITE_CREATE(){
 				DEL-SSL ${SITENAME} >/dev/null 2>&1
 				echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n"
 				echo -en "\n${idsCL[LightCyan]}Requesting new SSL Cert ... "
-				NEWCERT ${SERVERNAMES} >/dev/null 2>&1
+				NEWCERT ${NGINX_SERVERNAME} >/dev/null 2>&1
 				echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n"
 				sed -i "s/live\/${SITENAME}\//live\/${MAIN_SITE}\//g" ${nginxconfig}
 				
-			elif [ "${oldservernames}" != "${SERVERNAMES}" ]; then
+			elif [ "${oldservernames}" != "${NGINX_SERVERNAME}" ]; then
 				echo -e "\n${idsCL[LightCyan]}Updating SSL Cert for hostname changes, select to 'Update' when prompted:"
-				NEWCERT ${SERVERNAMES}
+				NEWCERT ${NGINX_SERVERNAME}
 				echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n"
 			else
 				echo "WHAT ELSE"
@@ -526,7 +524,7 @@ NEWPROXYSITE_CREATE(){
 			sed -i "/set \$forward_scheme/d" ${nginxconfig}; sed -i "/server {/a\\\tset \$forward_scheme ${PROXYSCHEME};" ${nginxconfig}
 			sed -i "/set \$server/d" ${nginxconfig}; sed -i "/set \$forward_scheme/a\\\tset \$server         \"${PROXYHOST}\";" ${nginxconfig}
 			sed -i "/set \$port/d" ${nginxconfig}; sed -i "/set \$server/a\\\tset \$port           ${PROXYPORT};" ${nginxconfig}
-			sed -i "/server_name/,+1 d" ${nginxconfig}; sed -i "/set \$port/a\\\n\tserver_name ${SERVERNAMES//,/ };" ${nginxconfig}			
+			sed -i "/server_name/,+1 d" ${nginxconfig}; sed -i "/set \$port/a\\\n\tserver_name ${NGINX_SERVERNAME//,/ };" ${nginxconfig}			
 		fi