Nextcloud: Adapt configuration to v21.

2 files changed, 10 insertions, 6 deletions

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
@@ -24,60 +24,58 @@ server {
 
     include snippets/headers.conf;
     add_header X-Robots-Tag                      none;
     add_header X-Download-Options                noopen;
     add_header X-Permitted-Cross-Domain-Policies none;
 
     include snippets/ssl.conf;
     ssl_certificate     ssl/cloud.fripost.org.pem;
     ssl_certificate_key ssl/cloud.fripost.org.key;
     include             snippets/cloud.fripost.org.hpkp-hdr;
 
     location = /robots.txt {
         allow all;
         log_not_found off;
         access_log off;
     }
 
     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;
     fastcgi_buffers 64 4K;
     fastcgi_buffer_size 32k;
 
     # Enable gzip but do not remove ETag headers
     gzip on;
     gzip_vary on;
     gzip_comp_level 4;
     gzip_min_length 256;
     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; }
     location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console)         { internal; }
 
     location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|oc[ms]-provider/.+|core/templates/40[34])\.php(?:$|/) {
         include snippets/fastcgi-php.conf;
         fastcgi_param modHeadersAvailable     true;
         fastcgi_param front_controller_active true;
         fastcgi_intercept_errors on;
         fastcgi_request_buffering off;
         fastcgi_pass  unix:/run/php/php7.3-fpm@nextcloud.sock;
     }
 
     location ~ ^/(?:updater|oc[ms]-provider)(?:$|/) {
         try_files $uri/ =404;
         index index.php;
     }
 
     location ~ \.(?:css|js|woff2?|svg|gif|map)$ {
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
@@ -165,20 +165,26 @@
 - name: Configure Redis
   lineinfile: dest=/etc/redis/redis.conf
               regexp='^#?\\s*{{ item.var }}\\s+'
               line="{{ item.var }} {{ item.value }}"
               owner=redis group=redis
               mode=0640
   with_items:
     - { var: port,           value: 0 }
     - { var: unixsocket,     value: /run/redis/redis-server.sock }
     - { var: unixsocketperm, value: 660 }
   notify:
     - Restart Redis
 
 - name: Start redis-server
   service: name=redis-server state=started
 
 - name: Add '_nextcloud' user to 'redis' group
   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