diff --git a/defaults.inc b/defaults.inc index 4ffd86ad..9c07fa17 100755 --- a/defaults.inc +++ b/defaults.inc @@ -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 diff --git a/inc/sites.inc b/inc/sites.inc index cb82b5b6..237c0cfb 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -361,13 +361,18 @@ NEWSITE(){ [ "${WEBSOCKET}" == "yes" ] && WEBSOCKET="include conf.d\/include\/websocket-support.conf;" || WEBSOCKET="" [ "${HSTS}" == "yes" ] && HSTS="include conf.d\/include\/hsts-support.conf;" || HSTS="" [ "${EXPLOITS}" == "yes" ] && EXPLOITS="include conf.d\/include\/block-exploits.conf;" || EXPLOITS="" - if [ "${SECURE}" == "yes" ]; then + if [ "${SECURE}" == "yes" ] && [ "${NM_DOCKER_COMPOSE_LOC['authelia']}" != "" ]; then SECURE="include conf.d\/include\/secure-access.conf;" + for NTYPE in "${NM_NODE_TYPES[@]}"; do + if [[ "${NM_DOCKERS_CHECK[${NTYPE}]}" == *"authelia"* ]]; then + NM_AUTHELIA_IP=${NM_SINGLESRVR_IP[${NTYPE}]} + break + fi + done + ssh root@${NM_AUTHELIA_IP} "sed -ie \"/domain: # Proxies only requiring username and password/a ~~~ - \\\"${MAIN_SITE}\\\"\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" + ssh root@${NM_AUTHELIA_IP} "sed -i \"s/~~~/ /g\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" - ssh root@${NM_SINGLESRVR_IP['WEB']} "sed -ie \"/domain: # Proxies only requiring username and password/a ~~~ - \\\"${MAIN_SITE}\\\"\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" - ssh root@${NM_SINGLESRVR_IP['WEB']} "sed -i \"s/~~~/ /g\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" - - ssh root@${NM_SINGLESRVR_IP['WEB']} "/usr/bin/docker restart authelia" + ssh root@${NM_AUTHELIA_IP} "/usr/bin/docker restart authelia" else SECURE=""