voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2023-12-27 13:11:47 -06:00
parent e93d906b78
commit 598ff3ca70
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='5.1.31-12192023' VERS='5.1.32-12272023'
NM_BETA=false 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 ' 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 '

6
inc/sites.inc
View File

@@ -425,14 +425,14 @@ NEWPROXYSITE_CREATE(){
DEL-SSL ${SITENAME} >/dev/null 2>&1 DEL-SSL ${SITENAME} >/dev/null 2>&1
echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n" echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n"
echo -en "\n${idsCL[LightCyan]}Requesting new SSL Cert ... " 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" echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n"
# sed -i "s/live\/${SITENAME}\//live\/${MAIN_SITE}\//g" ${nginxconfig} # sed -i "s/live\/${SITENAME}\//live\/${MAIN_SITE}\//g" ${nginxconfig}
sed -i "s/\/${SITENAME}/\/${MAIN_SITE}/g" ${nginxconfig} sed -i "s/\/${SITENAME}/\/${MAIN_SITE}/g" ${nginxconfig}
elif [ "${oldservernames}" != "${NGINX_SERVERNAME}" ]; then elif [ "${oldservernames}" != "${NGINX_SERVERNAME}" ]; then
echo -en "\n${idsCL[LightCyan]}Updating SSL Cert for hostname changes ... " 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" echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n"
fi fi
@@ -449,7 +449,7 @@ NEWPROXYSITE_CREATE(){
if [ ! -f ${NM_CERTPATH}/live/${MAIN_SITE}/cert.pem ]; then if [ ! -f ${NM_CERTPATH}/live/${MAIN_SITE}/cert.pem ]; then
echo -e "\n${idsCL[LightCyan]}No SSL cert detected, will generate one now ... " echo -e "\n${idsCL[LightCyan]}No SSL cert detected, will generate one now ... "
SERVICE_MGMT nginx restart SERVICE_MGMT nginx restart
NEWCERT ${CERTTEST}-newsite ${NGINX_SERVERNAME} NEWCERT ${CERTTEST} -newsite ${NGINX_SERVERNAME}
echo echo
else else
sed -i "s/#ssl_certificate/ssl_certificate/g" ${nginxconfig} sed -i "s/#ssl_certificate/ssl_certificate/g" ${nginxconfig}