From 7b44c557dea8c9d4497e73e80162924103f580d5 Mon Sep 17 00:00:00 2001
From: nd <git@notandy.de>
Date: Wed, 1 Sep 2021 00:21:30 +0200
Subject: [PATCH] fix new nextcloud warnings

---
 tasks/base.yml     | 23 ++++++++++++-----------
 templates/nginx.j2 |  3 +++
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/tasks/base.yml b/tasks/base.yml
index 22d1401..3529ca0 100644
--- a/tasks/base.yml
+++ b/tasks/base.yml
@@ -46,17 +46,18 @@
   args:
     chdir: /var/www/nextcloud
   with_items:
-  - { key: "mail_from_address", value: "{{ nextcloud.mail.from }}" }
-  - { key: "mail_domain",       value: "{{ nextcloud.mail.domain }}" }
-  - { key: "mail_smtpmode",     value: "{{ nextcloud.mail.mode }}" }
-  - { key: "mail_smtpauthtype", value: "PLAIN" }
-  - { key: "mail_smtphost",     value: "{{ nextcloud.mail.server|d('') }}" }
-  - { key: "mail_smtpport",     value: "25" }
-  - { key: "mail_smtppassword", value: "{{ nextcloud.mail.password|d('') }}" }
-  - { key: "mail_smtpname",     value: "{{ nextcloud.mail.user|d('') }}" }
-  - { key: "memcache.local",    value: '{{ "\OC\Memcache\APCu" }}' }
-  - { key: "datadirectory",     value: "{{ nextcloud.datadir }}" }
-  - { key: "defaultapp",        value: "files" }
+  - { key: "mail_from_address",    value: "{{ nextcloud.mail.from }}" }
+  - { key: "mail_domain",          value: "{{ nextcloud.mail.domain }}" }
+  - { key: "mail_smtpmode",        value: "{{ nextcloud.mail.mode }}" }
+  - { key: "mail_smtpauthtype",    value: "PLAIN" }
+  - { key: "mail_smtphost",        value: "{{ nextcloud.mail.server|d('') }}" }
+  - { key: "mail_smtpport",        value: "25" }
+  - { key: "mail_smtppassword",    value: "{{ nextcloud.mail.password|d('') }}" }
+  - { key: "mail_smtpname",        value: "{{ nextcloud.mail.user|d('') }}" }
+  - { key: "memcache.local",       value: '{{ "\OC\Memcache\APCu" }}' }
+  - { key: "datadirectory",        value: "{{ nextcloud.datadir }}" }
+  - { key: "defaultapp",           value: "files" }
+  - { key: "default_phone_region", value: "DE" }
 
 - name: copy nextcloud nginx config
   template:
diff --git a/templates/nginx.j2 b/templates/nginx.j2
index 5d9863d..2efe362 100644
--- a/templates/nginx.j2
+++ b/templates/nginx.j2
@@ -24,6 +24,9 @@ server {
 	location = /.well-known/caldav {
 		return 301 https://$host/remote.php/dav;
 	}
+	location ^~ /.well-known {
+		return 301 https://$host/index.php$uri;
+	}
 
 	location / {
 		rewrite ^ /index.php;