From 3f112bd38f97e4d2fdce933ddd9ed5bf8d8f8698 Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Thu, 14 Apr 2016 15:22:23 +0200 Subject: [PATCH] Revert "Fix redirection of .well-known URLs" This reverts commit b4dc06068b009f9e7c38d567e36b1f44a343450c. --- conf/nginx.conf | 2 ++ scripts/install | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index fa6a68b..8ae597e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -13,6 +13,8 @@ location PATHTOCHANGE { fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; } + #rewrite ~ ^/.well-known/caldav PATHTOCHANGE/cal.php redirect; + #rewrite ~ ^/.well-known/carddav PATHTOCHANGE/card.php redirect; } location ~ ^PATHTOCHANGE/(\.ht|Core|Specific) { diff --git a/scripts/install b/scripts/install index f5219be..b5eee0c 100644 --- a/scripts/install +++ b/scripts/install @@ -56,9 +56,6 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/baikal.conf sudo chown root: /etc/nginx/conf.d/$domain.d/baikal.conf sudo chmod 600 /etc/nginx/conf.d/$domain.d/baikal.conf -# Configure redirect for well-known URLs -sudo yunohost app setting baikal redirected_urls -v "{\"/.well-known/caldav\": \"$path/cal.php\",\"/.well-known/carddav\": \"$path/card.php\"}" - # Reload Nginx and regenerate SSOwat conf sudo service nginx reload sudo yunohost app setting baikal skipped_uris -v "/"