Merge branch 'stable' of ssh://hsh-peterhormanns@dev.hostsharing.net:29418/hsadmin/hs.hsadmin.git into stable
This commit is contained in:
commit
836688d00e
@ -48,12 +48,12 @@
|
|||||||
#if( ${autoconfig} )
|
#if( ${autoconfig} )
|
||||||
<Location /autodiscover/autodiscover.xml>
|
<Location /autodiscover/autodiscover.xml>
|
||||||
ProxyPreserveHost Off
|
ProxyPreserveHost Off
|
||||||
ProxyPass https://config.hostsharing.net/hsar/config-v1.1.xml
|
ProxyPass http://127.0.0.1:8082/
|
||||||
</Location>
|
</Location>
|
||||||
|
|
||||||
<Location /.well-known/autoconfig/mail/config-v1.1.xml>
|
<Location /.well-known/autoconfig/mail/config-v1.1.xml>
|
||||||
ProxyPreserveHost Off
|
ProxyPreserveHost Off
|
||||||
ProxyPass https://config.hostsharing.net/hsar/config-v1.1.xml
|
ProxyPass http://127.0.0.1:8081/
|
||||||
</Location>
|
</Location>
|
||||||
#end
|
#end
|
||||||
|
|
||||||
@ -135,12 +135,12 @@
|
|||||||
#if( ${autoconfig} )
|
#if( ${autoconfig} )
|
||||||
<Location /autodiscover/autodiscover.xml>
|
<Location /autodiscover/autodiscover.xml>
|
||||||
ProxyPreserveHost Off
|
ProxyPreserveHost Off
|
||||||
ProxyPass https://config.hostsharing.net/hsar/config-v1.1.xml
|
ProxyPass http://127.0.0.1:8082/
|
||||||
</Location>
|
</Location>
|
||||||
|
|
||||||
<Location /.well-known/autoconfig/mail/config-v1.1.xml>
|
<Location /.well-known/autoconfig/mail/config-v1.1.xml>
|
||||||
ProxyPreserveHost Off
|
ProxyPreserveHost Off
|
||||||
ProxyPass https://config.hostsharing.net/hsar/config-v1.1.xml
|
ProxyPass http://127.0.0.1:8081/
|
||||||
</Location>
|
</Location>
|
||||||
#end
|
#end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user