From 11c9920ca9fd899b3ae2e9eafebbd7c6a5171b1b Mon Sep 17 00:00:00 2001
From: root <root@f11391a1.federatedcomputer.cloud>
Date: Thu, 22 Feb 2024 16:32:03 +0000
Subject: [PATCH] Added autodiscover HTTP url password protected only on main
 url, not config.xml

---
 lib/autodiscover.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/autodiscover.sh b/lib/autodiscover.sh
index 0d99f79..f62c3b4 100644
--- a/lib/autodiscover.sh
+++ b/lib/autodiscover.sh
@@ -13,7 +13,7 @@ config_autodiscover() {
     mkdir -p /federated/apps/autodiscover
   fi
 
-#  TRAEFIK_HTTPAUTH_STRING_AUTODISCOVER=$(echo `htpasswd -nb admin@$DOMAIN $ADMINPASS` | sed -e s/\\$/\\$\\$/g)
+  TRAEFIK_HTTPAUTH_STRING_AUTODISCOVER=$(echo `htpasswd -nb admin@$DOMAIN $ADMINPASS` | sed -e s/\\$/\\$\\$/g)
 
 cat > /federated/apps/autodiscover/docker-compose.yml <<EOF
 version: '3.7'
@@ -37,8 +37,13 @@ services:
       - "traefik.http.routers.autodiscover.entrypoints=websecure"
       - "traefik.http.routers.autodiscover.tls.certresolver=letsencrypt"
       - "traefik.http.services.autodiscover.loadbalancer.server.port=8000"
-#      - "traefik.http.routers.autodiscover.middlewares=autodiscover-auth"
-#      - "traefik.http.middlewares.autodiscover-auth.basicauth.users=$TRAEFIK_HTTPAUTH_STRING_AUTODISCOVER"
+      - "traefik.http.routers.autodiscover.middlewares=autodiscover-auth"
+      - "traefik.http.middlewares.autodiscover-auth.basicauth.users=$TRAEFIK_HTTPAUTH_STRING_AUTODISCOVER"
+      - "traefik.http.routers.autodiscovernew.rule=Host(\`autoconfig.$DOMAIN\`,\`autodiscover.$DOMAIN\`) && PathPrefix(\`/mail\`)"
+      - "traefik.http.routers.autodiscovernew.entrypoints=websecure"
+      - "traefik.http.routers.autodiscovernew.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.autodiscovernew.service=autodiscovernew"
+      - "traefik.http.services.autodiscovernew.loadbalancer.server.port=8000"
 
 networks:
   federated: