From 36e687596a24796b08bf31e5ce437e699479be42 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 20 Jan 2021 15:27:48 +0100 Subject: [PATCH] Combine the two Nginx reverse proxy examples Signed-off-by: Morris Jobke --- .../reverse_proxy_configuration.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/admin_manual/configuration_server/reverse_proxy_configuration.rst b/admin_manual/configuration_server/reverse_proxy_configuration.rst index fdece9e5e..54023169e 100644 --- a/admin_manual/configuration_server/reverse_proxy_configuration.rst +++ b/admin_manual/configuration_server/reverse_proxy_configuration.rst @@ -68,12 +68,6 @@ Apache2 Thanks to `@ffried `_ for apache2 example. -nginx -^^^^^ -:: - rewrite ^/\.well-known/carddav https://$server_name/remote.php/dav/ redirect; - rewrite ^/\.well-known/caldav https://$server_name/remote.php/dav/ redirect; - Traefik 1 ^^^^^^^^^ @@ -123,6 +117,12 @@ NGINX return 301 $scheme://$host/remote.php/dav; } +or + +:: + rewrite ^/\.well-known/carddav https://$server_name/remote.php/dav/ redirect; + rewrite ^/\.well-known/caldav https://$server_name/remote.php/dav/ redirect; + CADDY ^^^^^ ::