From fad668cabbde33b9a1c557f66048b27aee49d1ea Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 27 Dec 2023 13:34:11 -0600
Subject: [PATCH] Update sites.inc

---
 inc/sites.inc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/inc/sites.inc b/inc/sites.inc
index 04600e78..70348aff 100755
--- a/inc/sites.inc
+++ b/inc/sites.inc
@@ -425,14 +425,14 @@ 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 ${CERTTEST} -expand -newsite ${NGINX_SERVERNAME} >/dev/null 2>&1
+				NEWCERT ${CERTTEST}-expand -newsite ${NGINX_SERVERNAME} >/dev/null 2>&1
 				echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n"
 				# sed -i "s/live\/${SITENAME}\//live\/${MAIN_SITE}\//g" ${nginxconfig}
 				sed -i "s/\/${SITENAME}/\/${MAIN_SITE}/g" ${nginxconfig}
 				
 			elif [ "${oldservernames}" != "${NGINX_SERVERNAME}" ]; then
 				echo -en "\n${idsCL[LightCyan]}Updating SSL Cert for hostname changes ... "
-				NEWCERT ${CERTTEST} -expand -newsite ${NGINX_SERVERNAME} >/dev/null 2>&1
+				NEWCERT ${CERTTEST}-expand -newsite ${NGINX_SERVERNAME} >/dev/null 2>&1
 				echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n"
 
 			fi
@@ -449,14 +449,13 @@ NEWPROXYSITE_CREATE(){
 			if [ ! -f ${NM_CERTPATH}/live/${MAIN_SITE}/cert.pem ]; then
 				echo -e "\n${idsCL[LightCyan]}No SSL cert detected, will generate one now ... "
 				SERVICE_MGMT nginx restart
-				NEWCERT ${CERTTEST} -newsite ${NGINX_SERVERNAME}
+				NEWCERT ${CERTTEST}-newsite ${NGINX_SERVERNAME}
 				echo
 			else
 				sed -i "s/#ssl_certificate/ssl_certificate/g" ${nginxconfig}
 				sed -i "s/#listen 443/listen 443/g" ${nginxconfig}
 				sed -i "s/#include conf.d\/include\/ssl-ciphers.conf/include conf.d\/include\/ssl-ciphers.conf/g" ${nginxconfig}
 				sed -i "s/#include conf.d\/include\/force-ssl.conf/include conf.d\/include\/force-ssl.conf/g" ${nginxconfig}
-				echo
 			fi
 			echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
 		else