upgrade to nextcloud 15

rootfs/etc/confd/templates/nextcloud.conf.tmpl

@@ -16,7 +16,7 @@ server {
     add_header X-Download-Options noopen;
     add_header X-Permitted-Cross-Domain-Policies none;
 
-    root /usr/share/webapps/nextcloud/;
+    root /var/lib/nextcloud/;
 
     location = /robots.txt {
         allow all;
@@ -24,17 +24,17 @@ server {
         access_log off;
     }
 
-    location = /.well-known/carddav { 
-        return 301 $scheme://$host/remote.php/dav; 
+    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/caldav {
+        return 301 $scheme://$host/remote.php/dav;
     }
-    
+
     client_max_body_size {{getenv "MAX_UPLOAD_SIZE"}};
     fastcgi_buffers 64 4K;
-    
+
     gzip on;
     gzip_vary on;
     gzip_comp_level 4;
@@ -59,7 +59,7 @@ server {
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_param PATH_INFO $fastcgi_path_info;
         fastcgi_param HTTPS on;
-        
+
         #Avoid sending the security headers twice
         fastcgi_param modHeadersAvailable true;
         fastcgi_param front_controller_active true;

rootfs/etc/cont-init.d/00-nextcloud

@@ -1,35 +1,47 @@
 #!/usr/bin/with-contenv sh
 set -ex
 
-cd /usr/share/webapps/nextcloud
+cd /var/lib/nextcloud
+chmod +x ./occ
 
 if [ ! -f /var/lib/nextcloud/data/.installed ]; then
     s6-setuidgid nginx ./occ maintenance:install \
         --database=pgsql \
-        --database-host=$DB_HOST \
-        --database-name=$DB_NAME \
-        --database-user=$DB_USER \
-        --database-pass=$DB_PASSWORD \
-        --database-table-prefix=$DB_TABLE_PREFIX \
-        --admin-user=$ADMIN_USER \
-        --admin-pass=$ADMIN_PASSWORD \
+        --database-host="$DB_HOST" \
+        --database-name="$DB_NAME" \
+        --database-user="$DB_USER" \
+        --database-pass="$DB_PASSWORD" \
+        --database-table-prefix="$DB_TABLE_PREFIX" \
+        --admin-user="$ADMIN_USER" \
+        --admin-pass="$ADMIN_PASSWORD" \
         --data-dir=/var/lib/nextcloud/data/ \
         --no-interaction
 
-    s6-setuidgid nginx ./occ config:app:set --value cron core backgroundjobs_mode
-    s6-setuidgid nginx ./occ app:enable user_ldap
-    s6-setuidgid nginx ./occ app:enable files_sharing
-    s6-setuidgid nginx ./occ app:enable files_texteditor
-    s6-setuidgid nginx ./occ app:enable files_pdfviewer
-    s6-setuidgid nginx ./occ app:enable files_videoplayer
-    s6-setuidgid nginx ./occ app:enable theming
-    s6-setuidgid nginx ./occ app:enable gallery
-    s6-setuidgid nginx ./occ app:enable twofactor_totp
-    s6-setuidgid nginx ./occ app:enable twofactor_backupcodes
-
     touch /var/lib/nextcloud/data/.installed
 fi
 
+s6-setuidgid nginx ./occ config:app:set --value cron core backgroundjobs_mode
+s6-setuidgid nginx ./occ app:enable user_ldap
+s6-setuidgid nginx ./occ app:enable files_sharing
+s6-setuidgid nginx ./occ app:enable files_texteditor
+s6-setuidgid nginx ./occ app:enable files_pdfviewer
+s6-setuidgid nginx ./occ app:enable files_videoplayer
+s6-setuidgid nginx ./occ app:enable theming
+s6-setuidgid nginx ./occ app:enable gallery
+s6-setuidgid nginx ./occ app:enable twofactor_totp
+s6-setuidgid nginx ./occ app:enable twofactor_backupcodes
+s6-setuidgid nginx ./occ app:enable twofactor_u2f
+s6-setuidgid nginx ./occ app:enable polls
+s6-setuidgid nginx ./occ app:disable activity
+s6-setuidgid nginx ./occ app:disable comments
+s6-setuidgid nginx ./occ app:disable files_trashbin
+s6-setuidgid nginx ./occ app:disable firstrunwizard
+s6-setuidgid nginx ./occ app:disable logreader
+s6-setuidgid nginx ./occ app:disable password_policy
+s6-setuidgid nginx ./occ app:disable support
+s6-setuidgid nginx ./occ app:disable survey_client
+s6-setuidgid nginx ./occ app:disable updatenotification
+
 s6-setuidgid nginx ./occ config:system:set --value "https://$DOMAIN" overwrite.cli.url
 s6-setuidgid nginx ./occ config:system:set --value "localhost" trusted_domains 0
 s6-setuidgid nginx ./occ config:system:set --value "$DOMAIN" trusted_domains 1

rootfs/etc/fix-attrs.d/01-nextcloud-data-dir

@@ -1,3 +1,2 @@
 /var/lib/nextcloud/ true nginx 0640 0750
-/etc/nextcloud/ true nginx 0640 0750
-/usr/share/webapps/nextcloud/apps true nginx 0640 0750
+/var/lib/nextcloud/config true nginx 0640 0750