From fca823b1ffa1553e8312ef09a5e8e57cf88e41c3 Mon Sep 17 00:00:00 2001
From: Wdavery <wdavery@averynet.org>
Date: Wed, 14 Jul 2021 15:00:22 -0400
Subject: [PATCH] Fixes for NC21 - changes /.well-known block

Before this change the config results in a warning `Your web server is not properly set up to resolve "/.well-known/webfinger".`
Source of proposed fix: linuxserver/docker-nextcloud#189
https://github.com/linuxserver/docker-nextcloud/issues/189#issuecomment-846376583
---
 nextcloud.subfolder.conf.sample | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/nextcloud.subfolder.conf.sample b/nextcloud.subfolder.conf.sample
index 0fa9195..717adf5 100644
--- a/nextcloud.subfolder.conf.sample
+++ b/nextcloud.subfolder.conf.sample
@@ -1,4 +1,4 @@
-## Version 2021/07/08
+## Version 2021/07/14
 # Assuming this container is called "swag", edit your nextcloud container's config
 # located at /config/www/nextcloud/config/config.php and add the following lines before the ");":
 #  'trusted_proxies' => ['swag'],
@@ -11,18 +11,17 @@
 #    1 => 'your-domain.com',
 #  ),
 
-# Redirects for DAV clients
-location = /.well-known/carddav {
-    return 301 $scheme://$host/nextcloud/remote.php/dav;
-}
+location ^~ /.well-known {
+        # The rules in this block are an adaptation of the rules
+        # in the Nextcloud `.htaccess` that concern `/.well-known`.
 
-location = /.well-known/caldav {
-    return 301 $scheme://$host/nextcloud/remote.php/dav;
-}
+        location = /.well-known/carddav { return 301 /nextcloud/remote.php/dav/; }
+        location = /.well-known/caldav  { return 301 /nextcloud/remote.php/dav/; }
 
-location /nextcloud {
-    return 301 $scheme://$host/nextcloud/;
-}
+        # Let Nextcloud's API for `/.well-known` URIs handle all other
+        # requests by passing them to the front-end controller.
+        return 301 /nextcloud/index.php$request_uri;
+    }
 
 location ^~ /nextcloud/ {
     include /config/nginx/proxy.conf;