From 28ca6a80083677c15c60b0bd8778bdb9e9e39e4f Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Wed, 19 Feb 2020 09:59:41 +0100
Subject: [PATCH] adjust autoconfig vhost template

---
 .../src/de/hsadmin/mods/dom/apache-vhost.vm   | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm b/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
index b819f36..47cfe9e 100644
--- a/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
+++ b/hsarback/src/de/hsadmin/mods/dom/apache-vhost.vm
@@ -48,13 +48,21 @@
         Options +ExecCGI +IncludesNoExec -Indexes -MultiViews +SymLinksIfOwnerMatch
     </Location>
 
+#if( ${autoconfig} )
+    <Location /autodiscover/autodiscover.xml>
+        ProxyPreserveHost Off
+        ProxyPass https://config.hostsharing.net/hsar/config-v1.1.xml
+    </Location>
+
+    <Location /.well-known/autoconfig/mail/config-v1.1.xml>
+        ProxyPreserveHost Off
+        ProxyPass https://config.hostsharing.net/hsar/config-v1.1.xml
+    </Location>
+#end
+
     RewriteEngine On
     RewriteOptions Inherit
 
-#if( ${autoconfig} )
-    RewriteRule ^/mail/config-v1.1.xml$ ajp://config.hostsharing.net:8009/hsar/config-v1.1.xml [proxy,last]
-#end
-
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
     RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
 #if( ${letsencrypt} )
@@ -130,14 +138,21 @@
         Options +ExecCGI +IncludesNoExec -Indexes -MultiViews +SymLinksIfOwnerMatch
     </Location>
 
+#if( ${autoconfig} )
+    <Location /autodiscover/autodiscover.xml>
+        ProxyPreserveHost Off
+        ProxyPass https://config.hostsharing.net/hsar/config-v1.1.xml
+    </Location>
+
+    <Location /.well-known/autoconfig/mail/config-v1.1.xml>
+        ProxyPreserveHost Off
+        ProxyPass https://config.hostsharing.net/hsar/config-v1.1.xml
+    </Location>
+#end
+
     RewriteEngine On
     RewriteOptions Inherit
 
-#if( ${autoconfig} )
-    RewriteRule ^/mail/config-v1.1.xml$ ajp://config.hostsharing.net:8009/hsar/config-v1.1.xml [proxy,last]
-    RewriteRule ^/autodiscover/autodiscover.xml$ ajp://config.hostsharing.net:8009/hsar/config-v1.1.xml [proxy,last]
-#end
-
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
     RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
 #if( ${letsencrypt} )