Merge branch 'master' into renovate/github.com-mattn-go-sqlite3-1.x

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;
     }

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 >}}

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`:
     </Proxy>
     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]
 </VirtualHost>
 {{< /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">}}).

go.mod

@@ -21,7 +21,7 @@ require (
 	code.vikunja.io/web v0.0.0-20200809154828-8767618f181f
 	gitea.com/xorm/xorm-redis-cache v0.2.0
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
-	github.com/asaskevich/govalidator v0.0.0-20200818142706-50839af6027e
+	github.com/asaskevich/govalidator v0.0.0-20200819183940-29e1ff8eb0bb
 	github.com/beevik/etree v1.1.0 // indirect
 	github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee
 	github.com/client9/misspell v0.3.4

go.sum

@@ -69,6 +69,8 @@ github.com/asaskevich/govalidator v0.0.0-20200817114649-df4adffc9d8c h1:W9P/cRMh
 github.com/asaskevich/govalidator v0.0.0-20200817114649-df4adffc9d8c/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/asaskevich/govalidator v0.0.0-20200818142706-50839af6027e h1:6P0tOQaAiB0G+etsknZvSDjNpdYshZ7wFXTqJpl41h0=
 github.com/asaskevich/govalidator v0.0.0-20200818142706-50839af6027e/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
+github.com/asaskevich/govalidator v0.0.0-20200819183940-29e1ff8eb0bb h1:kvlW1qyM1aU3xeyeIVTU2jx5fSvjKpsU3aXvuaCMg3Q=
+github.com/asaskevich/govalidator v0.0.0-20200819183940-29e1ff8eb0bb/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=
 github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=