From 235a8da273a929551263646f3bdc457915972299 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 11 Nov 2023 23:31:31 -0600 Subject: [PATCH] Update sites.inc --- inc/sites.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/inc/sites.inc b/inc/sites.inc index 46ce6eef..3b2c16f0 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -585,6 +585,12 @@ SITEINFO(){ else echo -e "${idsCL[LightGreen]}Local NGINX Sites ${idsCL[Default]}" fi + if [ "${onefacline}" == "" ]; then + onefacline=$(ssh root@${NM_AUTHELIA_IP} grep -Fn one_factor /mnt/web-data/authelia/config/configuration.yml | sort | tail -n1) + onefacline=${onefacline%%:*} + twofacline=$(ssh root@${NM_AUTHELIA_IP} grep -Fn two_factor /mnt/web-data/authelia/config/configuration.yml | sort | tail -n1) + twofacline=${twofacline%%:*} + fi gosite=${NM_NGINXPATH[${RUN_NODE_TYPE}]}/sites-enabled declare -A SITELIST @@ -628,12 +634,7 @@ SITEINFO(){ # [ "$(grep '\#include conf.d/include/secure-access.conf' ${sitefile})" != "" ] && lock='' || lock='Yes' if [ "$(grep '\#include conf.d/include/secure-access.conf' ${sitefile})" == "" ] && [ "$(grep 'include conf.d/include/secure-access.conf' ${sitefile})" != "" ]; then - if [ "${onefacline}" == "" ]; then - onefacline=$(ssh root@${NM_AUTHELIA_IP} grep -Fn one_factor /mnt/web-data/authelia/config/configuration.yml | sort | tail -n1) - onefacline=${onefacline%%:*} - twofacline=$(ssh root@${NM_AUTHELIA_IP} grep -Fn two_factor /mnt/web-data/authelia/config/configuration.yml | sort | tail -n1) - twofacline=${twofacline%%:*} - fi + sitefacline=$(ssh root@${NM_AUTHELIA_IP} grep -Fn ${site} /mnt/web-data/authelia/config/configuration.yml) sitefacline=${sitefacline%%:*} if [ "${sitefacline}" == "" ]; then