From 39cd66be541769163a56199feb868b3234ef6ddd Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 8 Jul 2023 22:50:45 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/sites.inc | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/defaults.inc b/defaults.inc index 704d0206..b829da85 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='4.9.5-07062023' +VERS='4.9.6-07062023' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns ' CERT_DAEMON='/snap/bin/certbot' diff --git a/inc/sites.inc b/inc/sites.inc index 56acaad9..6bb0a3d2 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -286,6 +286,7 @@ NEWSITE(){ SECURE=no elif [[ ${SECURE} =~ ^[Yy]$ ]]; then SECURE=yes + else SECURE=no fi @@ -333,8 +334,15 @@ 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="" - [ "${SECURE}" == "yes" ] && SECURE="include conf.d\/include\/secure-access.conf;" || SECURE="" - + if [ "${SECURE}" == "yes" ]; then + SECURE="include conf.d\/include\/secure-access.conf;" + + 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 + else + SECURE="" + + fi ######################################### LOCAL if [ "${SITE_TYPE}" = "local" ]; then