diff --git a/defaults.inc b/defaults.inc index a4e351e5..c969b6a1 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.13.32-11132023' +VERS='4.13.34-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 29fda6f9..5b649326 100755 --- a/inc/certs.inc +++ b/inc/certs.inc @@ -3,11 +3,13 @@ NEWCERT(){ CERTTEST=0; CERTEXPAND="" if [ "${3}" != "" ] && ([ ${3} -eq 0 ] || [ ${3} -eq 1 ]); then NEW_CERT=${1} + NEWSITE=${2} CERTTEST=${3} else while [ $# -gt 0 ]; do case "${1}" in -t|-test) CERTTEST=1;; + -newsite) NEWSITE=true;; -expand) CERTEXPAND='--expand';; -h|-help|--help) echo -e "Usage: ${idsCL[Yellow]}[nodemgmt or nmg] newcert {hostname}${idsCL[Default]} {" @@ -61,7 +63,7 @@ NEWCERT(){ sed -i "s/#ssl_certificate/ssl_certificate/g" ${NM_NGINXPATH}/sites-enabled/${MAIN_CERT}.conf DIVIDER true - if [ "${2}" != "newsite" ]; then + if [ "${NEWSITE}" != "true" ]; then echo -e -n "${idsCL[LightCyan]}Restart NGINX on all Nodes (Y/n): ${idsCL[Default]}" read -n 1 NGINXRELOAD if [[ ${NGINXRELOAD} =~ ^[Nn]$ ]]; then diff --git a/inc/sites.inc b/inc/sites.inc index e5c13a64..e3558637 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -420,7 +420,7 @@ NEWSITE(){ ######################################### PROXY else - NEWPROXYSITE_CREATE ${MAIN_SITE} ${NGINX_SERVERNAME} ${PROXYHOST} ${PROXYPORT} ${PROXYSCHEME} ${WEBSOCKET} ${HSTS} ${EXPLOITS} ${SECURE} ${CREATE_SSL} + NEWPROXYSITE_CREATE ${MAIN_SITE} ${NGINX_SERVERNAME} ${PROXYHOST} ${PROXYPORT} ${PROXYSCHEME} ${WEBSOCKET} ${HSTS} ${EXPLOITS} ${SECURE} ${CREATE_SSL} ${CERTTEST} fi @@ -474,7 +474,10 @@ NEWPROXYSITE_CREATE(){ EXPLOITS=${8} SECURE=${9} SSL=${10} + CERTTEST=${11} + [ "${CERTTEST}" == "1" ] && CERTTEST='-test ' || CERTTEST='' + if [[ ${SERVERNAMES} == *","* ]]; then NGINX_SERVERNAME=${SERVERNAMES} IFS=','; SERVERNAMES=(${SERVERNAMES}); unset IFS @@ -508,14 +511,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 -expand ${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 -expand ${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 @@ -538,7 +541,7 @@ NEWPROXYSITE_CREATE(){ echo if [ ! -f ${NM_CERTPATH}/live/${MAIN_SITE}/cert.pem ]; then echo -e "\n${idsCL[LightCyan]}No SSL cert detected, will generate one now ... " - NEWCERT ${NGINX_SERVERNAME} + NEWCERT ${CERTTEST}-newsite ${NGINX_SERVERNAME} echo fi else @@ -952,8 +955,12 @@ EDITSITE(){ ;; *) [ "${confirm}" !="" ] && echo + if [ "${CERTTEST}" != "" ]; then + echo -e "${idsCL[LightYellow]}${idsST[Bold]}### REQUESTING CERT IN TEST MODE ###${idsST[Reset]}${idsCL[Default]}" + echo + fi echo -en "\033[1A\033[K\r${idsCL[LightCyan]}Configuring changes ... ${idsCL[Default]}" - NEWPROXYSITE_CREATE ${site} ${servernames} ${server} ${port} ${scheme} ${wbskt} ${hsts} ${explt} ${lock} ${ssl} #>/dev/null 2>&1 + NEWPROXYSITE_CREATE ${site} ${servernames} ${server} ${port} ${scheme} ${wbskt} ${hsts} ${explt} ${lock} ${ssl} ${CERTTEST}#>/dev/null 2>&1 echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" echo