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

update

Browse Source
This commit is contained in:
David Schroeder
2025-06-01 13:56:59 -05:00
parent dbf0c65d41
commit de7837c831
4 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='5.5.13-06012025' VERS='5.5.14-06012025'
NM_BETA=false NM_BETA=false
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 betacheck offsite-staticroute-fix ' 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 betacheck offsite-staticroute-fix '

8
inc/certs.inc
View File

@@ -86,7 +86,13 @@ NEWCERT(){
sed -i "s/#include conf.d\/include\/force-ssl.conf/include conf.d\/include\/force-ssl.conf/g" ${NM_NGINXPATH}/sites-available/${MAIN_CERT}.conf sed -i "s/#include conf.d\/include\/force-ssl.conf/include conf.d\/include\/force-ssl.conf/g" ${NM_NGINXPATH}/sites-available/${MAIN_CERT}.conf
DIVIDER true DIVIDER true
[ ${NONGINXRESTART} -eq 0 ] && SERVICE_MGMT nginx restart if [ ${NONGINXRESTART} -eq 0 ]; then
if [[ "${RUN_NODE_IP}" != "10.6.1"* ]]; then
SERVICE_MGMT nginx restart
else
/bin/systemctl restart nginx
fi
fi
fi fi
echo echo
echo -e "${idsCL[Green]}Certificate has been successfully created for '${idsCL[Yellow]}${NEW_CERT}${idsCL[Green]}'...${idsCL[Default]}" echo -e "${idsCL[Green]}Certificate has been successfully created for '${idsCL[Yellow]}${NEW_CERT}${idsCL[Green]}'...${idsCL[Default]}"

25
inc/sites.inc
View File

@@ -56,8 +56,11 @@ DELSITE(){
[ "${NM_AUTHELIA_IP}" != "" ] && ${SSHCMD} root@${NM_AUTHELIA_IP} sed -i "/${DEL_SITE}/d" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml [ "${NM_AUTHELIA_IP}" != "" ] && ${SSHCMD} root@${NM_AUTHELIA_IP} sed -i "/${DEL_SITE}/d" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml
if [[ "${RUN_NODE_IP}" != "10.6.1"* ]]; then
SERVICE_MGMT nginx restart SERVICE_MGMT nginx restart
else
/bin/systemctl restart nginx
fi
echo -e "${idsCL[LightRed]}Site has been deleted.${idsCL[Default]}\n" echo -e "${idsCL[LightRed]}Site has been deleted.${idsCL[Default]}\n"
else else
echo "Missing arguments" echo "Missing arguments"
@@ -342,11 +345,6 @@ NEWSITE(){
fi fi
# if [ "${CREATE_SSL}" = "yes" ]; then
# [ -f ${NM_NGINXPATH}/sites-available/default* ] && SERVICE_MGMT nginx restart >/dev/null 2>&1
# NEWCERT ${NEW_SITE} newsite ${CERTTEST}
# 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
DIVIDER true DIVIDER true
@@ -359,10 +357,18 @@ NEWSITE(){
if [[ ${NGINXRELOAD} =~ ^[Nn]$ ]]; then if [[ ${NGINXRELOAD} =~ ^[Nn]$ ]]; then
echo echo
else else
if [[ "${RUN_NODE_IP}" != "10.6.1"* ]]; then
SERVICE_MGMT nginx restart SERVICE_MGMT nginx restart
else
/bin/systemctl restart nginx
fi
fi fi
else else
if [[ "${RUN_NODE_IP}" != "10.6.1"* ]]; then
SERVICE_MGMT nginx restart SERVICE_MGMT nginx restart
else
/bin/systemctl restart nginx
fi
fi fi
else else
echo "Missing proxy arguments" echo "Missing proxy arguments"
@@ -448,7 +454,6 @@ NEWPROXYSITE_CREATE(){
echo -en "${idsCL[LightCyan]}Enabling SSL ... " echo -en "${idsCL[LightCyan]}Enabling SSL ... "
if [ ! -f ${NM_CERTPATH}/live/${MAIN_SITE}/cert.pem ]; then if [ ! -f ${NM_CERTPATH}/live/${MAIN_SITE}/cert.pem ]; then
echo -e "\n${idsCL[LightCyan]}No SSL cert detected, will generate one now ... " echo -e "\n${idsCL[LightCyan]}No SSL cert detected, will generate one now ... "
SERVICE_MGMT nginx restart
NEWCERT ${CERTTEST}-newsite -nnr ${NGINX_SERVERNAME} NEWCERT ${CERTTEST}-newsite -nnr ${NGINX_SERVERNAME}
echo echo
fi fi
@@ -910,7 +915,11 @@ EDITSITE(){
echo echo
echo -en "\033[1A\033[K\r${idsCL[LightCyan]}Restarting NGINX on all '${RUN_NODE_TYPE}' Nodes ... ${idsCL[Default]}" echo -en "\033[1A\033[K\r${idsCL[LightCyan]}Restarting NGINX on all '${RUN_NODE_TYPE}' Nodes ... ${idsCL[Default]}"
SERVICE_MGMT nginx restart #>/dev/null 2>&1 if [[ "${RUN_NODE_IP}" != "10.6.1"* ]]; then
SERVICE_MGMT nginx restart
else
/bin/systemctl restart nginx
fi
echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}"
echo echo

4
nodemgmt-scripts.sh
View File

@@ -1539,7 +1539,11 @@ GUI(){
ln -s ${NM_NGINXPATH}/sites-available/${nfile##*/} ${nfile} ln -s ${NM_NGINXPATH}/sites-available/${nfile##*/} ${nfile}
echo "Done" echo "Done"
done done
if [[ "${RUN_NODE_IP}" != "10.6.1"* ]]; then
SERVICE_MGMT nginx restart SERVICE_MGMT nginx restart
else
/bin/systemctl restart nginx
fi
;; ;;
gui) GUI;; gui) GUI;;