kyleupgrade

This commit is contained in:
2023-11-10 23:35:18 -06:00
parent 6bd941a802
commit 2c07fed019
2 changed files with 23 additions and 7 deletions

View File

@@ -1,5 +1,6 @@
#!/usr/bin/env bash
VERS='4.12.114-11102023'
# VERS='4.12.120-11102023'
VERS='4.12.120-KYLEUPGRADE'
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'
@@ -135,7 +136,17 @@ else
fi
# echo "HERE: RUN_NODE_TYPE=$RUN_NODE_TYPE RUN_NODE_IP=$RUN_NODE_IP"
[ "${NM_REPL_NGINX_PATHS}" != "" ] && [ "${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}" != "" ] && NM_NGINXPATH=${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]} || NM_NGINXPATH=/etc/nginx
[ "${NM_CERTPATHS}" != "" ] && [ "${NM_CERTPATHS[${RUN_NODE_TYPE}]}" != "" ] && NM_CERTPATH=${NM_CERTPATHS[${RUN_NODE_TYPE}]} || NM_CERTPATH=/etc/letsencrypt
if [ "${NM_CERTPATHS}" != "" ]; then
if [ "${NM_CERTPATHS[${RUN_NODE_TYPE}]}" != "" ]; then
NM_CERTPATH=${NM_CERTPATHS[${RUN_NODE_TYPE}]}
NM_CERTNODE=${RUN_NODE_TYPE}
else
NM_CERTPATH=${NM_CERTPATHS[@]}
NM_CERTNODE=${!NM_CERTPATHS[@]}
fi
else
NM_CERTPATH=/etc/letsencrypt
fi
[ "${NM_WWWPATHS}" != "" ] && [ "${NM_WWWPATHS[${RUN_NODE_TYPE}]}" != "" ] && NM_WWWPATH=${NM_WWWPATHS[${RUN_NODE_TYPE}]} || NM_WWWPATH=/var/www
declare -A NM_SRVCOPTS