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

update

Browse Source
This commit is contained in:
David Schroeder
2023-11-14 10:26:37 -06:00
parent 6b01b54d4c
commit 85579b7769
3 changed files with 7 additions and 6 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='4.13.34-11142023' VERS='4.13.35-11142023'
noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update ' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update '
CERT_DAEMON='/snap/bin/certbot' CERT_DAEMON='/snap/bin/certbot'

7
inc/certs.inc
View File

@@ -110,9 +110,10 @@ DEL-SSL(){
echo echo
echo -en "${idsCL[LightRed]}Removing Files and Folders... ${idsCL[Default]}" echo -en "${idsCL[LightRed]}Removing Files and Folders... ${idsCL[Default]}"
rm -rf ${NM_CERTPATH}/archive/${DEL_SSL} rm -rf ${NM_CERTPATH}/archive/${DEL_SSL} >/dev/null 2&>1
rm -rf ${NM_CERTPATH}/live/${DEL_SSL} rm -rf ${NM_CERTPATH}/live/${DEL_SSL} >/dev/null 2&>1
rm -f ${NM_CERTPATH}/renewal/${DEL_SSL}.conf rm -f ${NM_CERTPATH}/renewal/${DEL_SSL}.conf >/dev/null 2&>1
[ -f ${NM_FOLDER}/conf/ssl-domain-checks.conf ] && sed -i "/${SUBJECT}/d" ${NM_FOLDER}/conf/ssl-domain-checks.conf >/dev/null 2&>1
echo -e "${idsCL[Green]}OK${idsCL[Default]}" echo -e "${idsCL[Green]}OK${idsCL[Default]}"
echo -e "\n${idsCL[LightRed]}The SSL certificate has been fully removed from the node(s).${idsCL[Default]}" echo -e "\n${idsCL[LightRed]}The SSL certificate has been fully removed from the node(s).${idsCL[Default]}"
else else

4
inc/sites.inc
View File

@@ -514,14 +514,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