Don't break Auto-Discovery for CalDAV and CardDAV via patch file

YetOpen · Sep 3, 2017 · 619f6e0 · 619f6e0
1 parent c972e5a
commit 619f6e0
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/patches/zimbra_8.7.0_letsencrypt_nginx.patch b/patches/zimbra_8.7.0_letsencrypt_nginx.patch
@@ -4,16 +4,7 @@
          # Fudge inter-mailbox redirects (kludge)
          proxy_redirect http://$relhost/ http://$http_host/;
      }
-+    location ^~ /.well-known { root /opt/zimbra/data/nginx/html; }
++    location ^~ /.well-known/acme-challenge { root /opt/zimbra/data/nginx/html; }
 
      #For long polling of Microsoft ActiveSync
      location ^~ /Microsoft-Server-ActiveSync
-@@ -357,7 +358,7 @@
-     #     proxy_redirect http://$relhost/ http://$http_host/;
-     # }
-
--    location ~* /(service|principals|dav|\.well-known|home|octopus|shf|user|certauth|spnegoauth|(zimbra/home)|(zimbra/user))/
-+    location ~* /(service|principals|dav|home|octopus|shf|user|certauth|spnegoauth|(zimbra/home)|(zimbra/user))/
-     {
-         # Begin stray redirect hack
-         #