diff --git a/defaults.inc b/defaults.inc index c969b6a1..a558d25d 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/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 ' CERT_DAEMON='/snap/bin/certbot' diff --git a/inc/certs.inc b/inc/certs.inc index 5b649326..c8a5199b 100755 --- a/inc/certs.inc +++ b/inc/certs.inc @@ -110,9 +110,10 @@ DEL-SSL(){ echo echo -en "${idsCL[LightRed]}Removing Files and Folders... ${idsCL[Default]}" - rm -rf ${NM_CERTPATH}/archive/${DEL_SSL} - rm -rf ${NM_CERTPATH}/live/${DEL_SSL} - rm -f ${NM_CERTPATH}/renewal/${DEL_SSL}.conf + rm -rf ${NM_CERTPATH}/archive/${DEL_SSL} >/dev/null 2&>1 + rm -rf ${NM_CERTPATH}/live/${DEL_SSL} >/dev/null 2&>1 + 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 "\n${idsCL[LightRed]}The SSL certificate has been fully removed from the node(s).${idsCL[Default]}" else diff --git a/inc/sites.inc b/inc/sites.inc index b8b204b7..72db4e58 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -514,14 +514,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