Merge branch 'stable' of ssh://hsh-peterhormanns@dev.hostsharing.net:29418/hsadmin/hs.hsadmin.git into stable

This commit is contained in:
Peter Hormanns 2020-04-28 18:01:38 +02:00
commit 836688d00e

View File

@ -48,12 +48,12 @@
#if( ${autoconfig} )
<Location /autodiscover/autodiscover.xml>
ProxyPreserveHost Off
ProxyPass https://config.hostsharing.net/hsar/config-v1.1.xml
ProxyPass http://127.0.0.1:8082/
</Location>
<Location /.well-known/autoconfig/mail/config-v1.1.xml>
ProxyPreserveHost Off
ProxyPass https://config.hostsharing.net/hsar/config-v1.1.xml
ProxyPass http://127.0.0.1:8081/
</Location>
#end
@ -135,12 +135,12 @@
#if( ${autoconfig} )
<Location /autodiscover/autodiscover.xml>
ProxyPreserveHost Off
ProxyPass https://config.hostsharing.net/hsar/config-v1.1.xml
ProxyPass http://127.0.0.1:8082/
</Location>
<Location /.well-known/autoconfig/mail/config-v1.1.xml>
ProxyPreserveHost Off
ProxyPass https://config.hostsharing.net/hsar/config-v1.1.xml
ProxyPass http://127.0.0.1:8081/
</Location>
#end