From 3faad95512464e23543cd9ffacd62d9ddacd7800 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 14 Nov 2023 10:54:58 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/certs.inc | 6 ++++-- inc/sites.inc | 51 +++++++++++++++++++++++++-------------------------- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/defaults.inc b/defaults.inc index a558d25d..ce9bc7ce 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.13.35-11142023' +VERS='4.13.36-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 c8a5199b..40fb9503 100755 --- a/inc/certs.inc +++ b/inc/certs.inc @@ -1,7 +1,7 @@ #!/usr/bin/env bash NEWCERT(){ CERTTEST=0; CERTEXPAND="" - if [ "${3}" != "" ] && ([ ${3} -eq 0 ] || [ ${3} -eq 1 ]); then + if [ "${3}" != "" ] && ([ "${3}" == "0" ] || [ "${3}" == "1" ]); then NEW_CERT=${1} NEWSITE=${2} CERTTEST=${3} @@ -76,6 +76,8 @@ NEWCERT(){ fi echo echo -e "${idsCL[Green]}Certificate has been successfully created for '${idsCL[Yellow]}${NEW_CERT}${idsCL[Green]}'...${idsCL[Default]}" + elif [ ${CERTTEST} -eq 1 ]; then + echo -e "${idsCL[Yellow]}Ran in Test Mode, did not generate SSL for '${idsCL[LightCyan]}${NEW_CERT}${idsCL[Yellow]}'...${idsCL[Default]}" else echo echo -e "${idsCL[Red]}Certificate could not be created for '${idsCL[Yellow]}${NEW_CERT}${idsCL[Red]}'...${idsCL[Default]}" @@ -399,7 +401,7 @@ LISTCERTS(){ [ "${confirm}" != "" ] && echo -en "\n" echo -en "\033[1A\033[K\r${idsCL[LightCyan]}Configuring changes ... ${idsCL[Default]}" - [ "${SUBJECTNAMES}" != "${oldSUBJECTNAMES}" ] && NEWCERT -expand ${SUBJECT},${SUBJECTNAMES} #>/dev/null 2&>1 + [ "${SUBJECTNAMES}" != "${oldSUBJECTNAMES}" ] && NEWCERT -expand -newsite ${SUBJECT},${SUBJECTNAMES} >/dev/null 2&>1 if [ "${monitored^^}" == "YES" ]; then if [ "$(grep ${SUBJECT} ${NM_FOLDER}/conf/ssl-domain-checks.conf)" == "" ]; then diff --git a/inc/sites.inc b/inc/sites.inc index b9457828..d33ce376 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -422,8 +422,7 @@ NEWSITE(){ ######################################### PROXY else - temp='' - # NEWPROXYSITE_CREATE ${MAIN_SITE} ${NGINX_SERVERNAME} ${PROXYHOST} ${PROXYPORT} ${PROXYSCHEME} ${WEBSOCKET} ${HSTS} ${EXPLOITS} ${SECURE} ${CREATE_SSL} ${CERTTEST} + NEWPROXYSITE_CREATE ${MAIN_SITE} ${NGINX_SERVERNAME} ${PROXYHOST} ${PROXYPORT} ${PROXYSCHEME} ${WEBSOCKET} ${HSTS} ${EXPLOITS} ${SECURE} ${CREATE_SSL} ${CERTTEST} fi @@ -432,27 +431,27 @@ NEWSITE(){ # NEWCERT ${NEW_SITE} newsite ${CERTTEST} # fi - daterun=`date +%Y-%m-%d-%H-%M-%S` - echo -e "${NEW_SITE}\n${daterun}" >| ${NM_LOGFOLDER}/new-site.lastrun - # yes | cp -rfH ${NM_LOGFOLDER}/new-site.lastrun ${NM_NGINXPATH}/new-site.lastrun - # yes | cp -rfH ${NM_LOGFOLDER}/new-site.lastrun ${NM_WWWPATH}/new-site.lastrun # daterun=`date +%Y-%m-%d-%H-%M-%S` - # echo -e "${daterun}" >> ${NM_NGINXPATH}/new-site.lastrun - DIVIDER true - echo - echo -e "${idsCL[LightGreen]}The new site for '${idsCL[LightGreen]}${NEW_SITE}${idsCL[Default]}' has been created.${idsCL[Default]}" - echo - if [ ! -f ${NM_NGINXPATH}/sites-enabled/default* ]; then - echo -en "${idsCL[LightCyan]}Restart NGINX on all Nodes (Y/n): ${idsCL[Default]}" - read -n 1 NGINXRELOAD - if [[ ${NGINXRELOAD} =~ ^[Nn]$ ]]; then - echo - else - SERVICE nginx restart - fi - else - SERVICE nginx restart - fi + # echo -e "${NEW_SITE}\n${daterun}" >| ${NM_LOGFOLDER}/new-site.lastrun + # # yes | cp -rfH ${NM_LOGFOLDER}/new-site.lastrun ${NM_NGINXPATH}/new-site.lastrun + # # yes | cp -rfH ${NM_LOGFOLDER}/new-site.lastrun ${NM_WWWPATH}/new-site.lastrun + # # daterun=`date +%Y-%m-%d-%H-%M-%S` + # # echo -e "${daterun}" >> ${NM_NGINXPATH}/new-site.lastrun + # DIVIDER true + # echo + # echo -e "${idsCL[LightGreen]}The new site for '${idsCL[LightGreen]}${NEW_SITE}${idsCL[Default]}' has been created.${idsCL[Default]}" + # echo + # if [ ! -f ${NM_NGINXPATH}/sites-enabled/default* ]; then + # echo -en "${idsCL[LightCyan]}Restart NGINX on all Nodes (Y/n): ${idsCL[Default]}" + # read -n 1 NGINXRELOAD + # if [[ ${NGINXRELOAD} =~ ^[Nn]$ ]]; then + # echo + # else + # SERVICE nginx restart + # fi + # else + # SERVICE nginx restart + # fi else echo "Missing proxy arguments" exit 1 @@ -503,7 +502,7 @@ NEWPROXYSITE_CREATE(){ sed -i "s/<>/${PROXYPORT}/g" ${nginxconfig} sed -i "s/<>/${PROXYSCHEME}/g" ${nginxconfig} sed -i "s%<>%${NM_CERTPATH}%g" ${nginxconfig} - echo -e "${idsCL[LightGreen]}CDone${idsCL[Default]}" + echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" else oldservernames=$(grep 'server_name' ${nginxconfig});oldservernames=${oldservernames//;/};oldservernames=${oldservernames#* };oldservernames=${oldservernames// /,} @@ -513,14 +512,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 @@ -963,7 +962,7 @@ EDITSITE(){ 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} ${CERTTEST} #>/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