Skip to content

Commit 0db45fe

Browse files
asessaandrea
andauthored
Refactor rewrite rules for carddav and caldav endpoints (hestiacp#4572)
Co-authored-by: andrea <andrea@blueboxsoft.com>
1 parent d7428ea commit 0db45fe

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

install/deb/templates/web/nginx/php-fpm/owncloud.stpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ server {
5656
# The following 2 rules are only needed with webfinger
5757
rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
5858
rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
59-
rewrite ^/.well-known/carddav /remote.php/carddav/ redirect;
60-
rewrite ^/.well-known/caldav /remote.php/caldav/ redirect;
59+
rewrite ^/.well-known/carddav /remote.php/dav redirect;
60+
rewrite ^/.well-known/caldav /remote.php/dav redirect;
6161
rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
6262

6363
try_files $uri $uri/ /index.php;

install/deb/templates/web/nginx/php-fpm/owncloud.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ server {
4747
# The following 2 rules are only needed with webfinger
4848
rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
4949
rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
50-
rewrite ^/.well-known/carddav /remote.php/carddav/ redirect;
51-
rewrite ^/.well-known/caldav /remote.php/caldav/ redirect;
50+
rewrite ^/.well-known/carddav /remote.php/dav redirect;
51+
rewrite ^/.well-known/caldav /remote.php/dav redirect;
5252
rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
5353
5454
try_files $uri $uri/ /index.php;

install/rpm/templates/web/nginx/php-fpm/owncloud.stpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ server {
5656
# The following 2 rules are only needed with webfinger
5757
rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
5858
rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
59-
rewrite ^/.well-known/carddav /remote.php/carddav/ redirect;
60-
rewrite ^/.well-known/caldav /remote.php/caldav/ redirect;
59+
rewrite ^/.well-known/carddav /remote.php/dav redirect;
60+
rewrite ^/.well-known/caldav /remote.php/dav redirect;
6161
rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
6262

6363
try_files $uri $uri/ /index.php;

install/rpm/templates/web/nginx/php-fpm/owncloud.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ server {
4747
# The following 2 rules are only needed with webfinger
4848
rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
4949
rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
50-
rewrite ^/.well-known/carddav /remote.php/carddav/ redirect;
51-
rewrite ^/.well-known/caldav /remote.php/caldav/ redirect;
50+
rewrite ^/.well-known/carddav /remote.php/dav redirect;
51+
rewrite ^/.well-known/caldav /remote.php/dav redirect;
5252
rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
5353
5454
try_files $uri $uri/ /index.php;

0 commit comments

Comments
 (0)