From 5d1907daa5e38f5c287a17e082b50cc01a72f396 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Sun, 23 May 2021 01:25:23 +0200
Subject: Nextcloud: Adapt configuration to v21.

---
 roles/nextcloud/files/etc/nginx/sites-available/nextcloud | 10 ++++------
 roles/nextcloud/tasks/main.yml                            |  6 ++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'roles/nextcloud')

diff --git a/roles/nextcloud/files/etc/nginx/sites-available/nextcloud b/roles/nextcloud/files/etc/nginx/sites-available/nextcloud
index 52f24e0..1bab6fd 100644
--- a/roles/nextcloud/files/etc/nginx/sites-available/nextcloud
+++ b/roles/nextcloud/files/etc/nginx/sites-available/nextcloud
@@ -41,8 +41,9 @@ server {
     access_log /var/log/nginx/cloud.access.log;
     error_log  /var/log/nginx/cloud.error.log info;
 
-    location = /.well-known/carddav { return 301 $scheme://$host/remote.php/dav; }
-    location = /.well-known/caldav  { return 301 $scheme://$host/remote.php/dav; }
+    location = /.well-known/carddav { return 301 /remote.php/dav; }
+    location = /.well-known/caldav  { return 301 /remote.php/dav; }
+    location ^~ /.well-known/       { return 301 /index.php$request_uri; }
 
     # set max upload size
     client_max_body_size 512M;
@@ -57,10 +58,7 @@ server {
     gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
     gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
 
-    error_page 403 /core/templates/403.php;
-    error_page 404 /core/templates/404.php;
-
-    location = / { return 303 $scheme://$host/apps/files/; }
+    location = / { return 303 /apps/files/; }
     location   / { rewrite ^ /index.php$uri last; }
 
     location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ { internal; }
diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index 4a366fa..4c049a9 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -182,3 +182,9 @@
   user: name=_nextcloud groups=redis append=yes
   notify:
     - Restart php7.3-fpm
+
+- name: Install other Nextcloud dependencies
+  apt: pkg={{ packages }}
+  vars:
+    packages:
+    - libmagickcore-6.q16-6-extra
-- 
cgit v1.2.3