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-02 13:38:57 -06:00
parent 67cc0da803
commit 9e43568c66
2 changed files with 23 additions and 23 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.16.18-11292023' VERS='4.16.19-12022023'
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 ' 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 '
CERT_DAEMON='/snap/bin/certbot' CERT_DAEMON='/snap/bin/certbot'

44
inc/sites.inc
View File

@@ -346,27 +346,23 @@ NEWSITE(){
# NEWCERT ${NEW_SITE} newsite ${CERTTEST} # NEWCERT ${NEW_SITE} newsite ${CERTTEST}
# fi # fi
# daterun=`date +%Y-%m-%d-%H-%M-%S` daterun=`date +%Y-%m-%d-%H-%M-%S`
# echo -e "${NEW_SITE}\n${daterun}" >| ${NM_LOGFOLDER}/new-site.lastrun echo -e "${NEW_SITE}\n${daterun}" >| ${NM_LOGFOLDER}/new-site.lastrun
# # yes | cp -rfH ${NM_LOGFOLDER}/new-site.lastrun ${NM_NGINXPATH}/new-site.lastrun DIVIDER true
# # yes | cp -rfH ${NM_LOGFOLDER}/new-site.lastrun ${NM_WWWPATH}/new-site.lastrun echo
# # daterun=`date +%Y-%m-%d-%H-%M-%S` echo -e "${idsCL[LightGreen]}The new site for '${idsCL[LightGreen]}${NEW_SITE}${idsCL[Default]}' has been created.${idsCL[Default]}"
# # echo -e "${daterun}" >> ${NM_NGINXPATH}/new-site.lastrun echo
# DIVIDER true if [ ! -f ${NM_NGINXPATH}/sites-enabled/default* ]; then
# echo echo -en "${idsCL[LightCyan]}Restart NGINX on all Nodes (Y/n): ${idsCL[Default]}"
# echo -e "${idsCL[LightGreen]}The new site for '${idsCL[LightGreen]}${NEW_SITE}${idsCL[Default]}' has been created.${idsCL[Default]}" read -n 1 NGINXRELOAD
# echo if [[ ${NGINXRELOAD} =~ ^[Nn]$ ]]; then
# if [ ! -f ${NM_NGINXPATH}/sites-enabled/default* ]; then echo
# echo -en "${idsCL[LightCyan]}Restart NGINX on all Nodes (Y/n): ${idsCL[Default]}" else
# read -n 1 NGINXRELOAD SERVICE_MGMT nginx restart
# if [[ ${NGINXRELOAD} =~ ^[Nn]$ ]]; then fi
# echo else
# else SERVICE_MGMT nginx restart
# SERVICE_MGMT nginx restart fi
# fi
# else
# SERVICE_MGMT nginx restart
# fi
else else
echo "Missing proxy arguments" echo "Missing proxy arguments"
exit 1 exit 1
@@ -882,7 +878,11 @@ EDITSITE(){
echo -e "${idsCL[LightYellow]}${idsST[Bold]}### REQUESTING CERT IN TEST MODE ###${idsST[Reset]}${idsCL[Default]}" echo -e "${idsCL[LightYellow]}${idsST[Bold]}### REQUESTING CERT IN TEST MODE ###${idsST[Reset]}${idsCL[Default]}"
echo echo
fi fi
echo -en "\033[1A\033[K\r${idsCL[LightCyan]}Configuring changes ... ${idsCL[Default]}" if [ "${NEWSITE}" == "true" ]; then
echo -en "\033[1A\033[K\r${idsCL[LightCyan]}Creating new site ... ${idsCL[Default]}"
else
echo -en "\033[1A\033[K\r${idsCL[LightCyan]}Configuring changes ... ${idsCL[Default]}"
fi
NEWPROXYSITE_CREATE ${SITENAME} ${SERVERNAMES} ${PROXYHOST} ${PROXYPORT} ${PROXYSCHEME} ${WEBSOCKET} ${HSTS} ${EXPLOITS} ${SECURE} ${SSL} ${CERTTEST} >/dev/null 2>&1 NEWPROXYSITE_CREATE ${SITENAME} ${SERVERNAMES} ${PROXYHOST} ${PROXYPORT} ${PROXYSCHEME} ${WEBSOCKET} ${HSTS} ${EXPLOITS} ${SECURE} ${SSL} ${CERTTEST} >/dev/null 2>&1
echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
echo echo