From d88551e99d80b1279ed11cced3d105458195c9f9 Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 20 Aug 2020 14:08:35 +0200 Subject: [PATCH] Add dav proxy directions to example proxy configurations Signed-off-by: kolaente --- docs/content/doc/setup/docker-start-to-finish.md | 2 +- docs/content/doc/setup/full-docker-example.md | 8 +++++--- docs/content/doc/setup/reverse-proxies.md | 12 ++++++++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/docs/content/doc/setup/docker-start-to-finish.md b/docs/content/doc/setup/docker-start-to-finish.md index a5af2a521b..f7de67823b 100644 --- a/docs/content/doc/setup/docker-start-to-finish.md +++ b/docs/content/doc/setup/docker-start-to-finish.md @@ -88,7 +88,7 @@ server { proxy_pass http://frontend:80; } - location /api/ { + location ~* ^/(api|dav|\.well-known)/ { proxy_pass http://api:3456; client_max_body_size 20M; } diff --git a/docs/content/doc/setup/full-docker-example.md b/docs/content/doc/setup/full-docker-example.md index 3fd1149670..00612e66ba 100644 --- a/docs/content/doc/setup/full-docker-example.md +++ b/docs/content/doc/setup/full-docker-example.md @@ -74,7 +74,7 @@ services: restart: unless-stopped labels: - "traefik.enable=true" - - "traefik.http.routers.vikunja-api.rule=Host(`vikunja.example.com`) && PathPrefix(`/api/v1`)" + - "traefik.http.routers.vikunja-api.rule=Host(`vikunja.example.com`) && PathPrefix(`/api/v1`, `/dav/`, `/.well-known/`)" - "traefik.http.routers.vikunja-api.entrypoints=https" - "traefik.http.routers.vikunja-api.tls.certResolver=acme" frontend: @@ -133,7 +133,7 @@ services: labels: - "traefik.docker.network=web" - "traefik.enable=true" - - "traefik.frontend.rule=Host:vikunja.example.com;PathPrefix:/api/v1" + - "traefik.frontend.rule=Host:vikunja.example.com;PathPrefix:/api/v1,/dav/,/.well-known" - "traefik.port=3456" - "traefik.protocol=http" frontend: @@ -179,7 +179,7 @@ server { proxy_pass http://frontend:80; } - location /api/ { + location ~* ^/(api|dav|\.well-known)/ { proxy_pass http://api:3456; client_max_body_size 20M; } @@ -240,6 +240,8 @@ You will need the following `Caddyfile` on your host (or elsewhere, but then you {{< highlight conf >}} vikunja.example.com { reverse_proxy /api/* api:3456 + reverse_proxy /.well-known/* api:3456 + reverse_proxy /dav/* api:3456 reverse_proxy frontend:80 } {{< /highlight >}} diff --git a/docs/content/doc/setup/reverse-proxies.md b/docs/content/doc/setup/reverse-proxies.md index 3abf4102c5..7ab5f2f0d0 100644 --- a/docs/content/doc/setup/reverse-proxies.md +++ b/docs/content/doc/setup/reverse-proxies.md @@ -43,7 +43,7 @@ server { index index.html index.htm; } - location /api/ { + location ~* ^/(api|dav|\.well-known)/ { proxy_pass http://localhost:3456; client_max_body_size 20M; } @@ -67,7 +67,7 @@ server { index index.html index.htm; } - location /api/ { + location ~* ^/(api|dav|\.well-known)/ { proxy_pass http://localhost:3456; client_max_body_size 20M; } @@ -92,14 +92,18 @@ Put the following config in `cat /etc/apache2/sites-available/vikunja.conf`: ProxyPass /api http://localhost:3456/api ProxyPassReverse /api http://localhost:3456/api + ProxyPass /dav http://localhost:3456/dav + ProxyPassReverse /dav http://localhost:3456/dav + ProxyPass /.well-known http://localhost:3456/.well-known + ProxyPassReverse /.well-known http://localhost:3456/.well-known DocumentRoot /var/www/html RewriteEngine On - RewriteRule ^\/?(config\.json|favicon\.ico|css|fonts|images|img|js|api) - [L] + RewriteRule ^\/?(config\.json|favicon\.ico|css|fonts|images|img|js|api|dav|\.well-known) - [L] RewriteRule ^(.*)$ /index.html [QSA,L] {{< /highlight >}} -**Note:** The apache modules `proxy` and `proxy_http` must be enabled for this. +**Note:** The apache modules `proxy`, `proxy_http` and `rewrite` must be enabled for this. For more details see the [frontend apache configuration]({{< ref "install-frontend.md#apache">}}). \ No newline at end of file