diff --git a/defaults.inc b/defaults.inc index fc8cfdb7..3398f2c6 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='5.1.31-12192023' +VERS='5.1.32-12272023' NM_BETA=false 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 betacheck ' diff --git a/inc/sites.inc b/inc/sites.inc index 63ca09fc..04600e78 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,7 +449,7 @@ 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}