[NC] Reduce upstream diff and improve env vars

By keeping the dfif against upstream we can follow them easier over
time.

And by having env vars explicit, we can get rid of the auxiliary env
files.

dd-apps/docker/nextcloud/dd-patch

@@ -1,6 +1,7 @@
 # Generate .orig and .patch files with ./dd-ctl genpatches
 # file	license	author	source
-nginx.conf	AGPL-3.0-or-later	https://github.com/nextcloud/	https://raw.githubusercontent.com/nextcloud/docker/522559eefdd56d2e49259c3b0f4a0e92882cdb87/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
+nginx.conf	AGPL-3.0-or-later	https://github.com/nextcloud/	https://raw.githubusercontent.com/nextcloud/docker/04ab3157e4f1197a9f8f4b91cf2430586356dd9a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
+supervisord.conf	AGPL-3.0-or-later	https://github.com/nextcloud/	https://raw.githubusercontent.com/nextcloud/docker/04ab3157e4f1197a9f8f4b91cf2430586356dd9a/.examples/dockerfiles/cron/fpm-alpine/supervisord.conf
 nc_mail/appinfo/info.xml	AGPL-3.0-or-later	https://github.com/nextcloud/	https://raw.githubusercontent.com/nextcloud/mail/v1.15.1/appinfo/info.xml
 nc_mail/lib/Command/UpdateAccount.php	AGPL-3.0-or-later	https://github.com/nextcloud/	https://raw.githubusercontent.com/nextcloud/mail/1e777a1783254bd4b7f69f39a6c5123323f8b701/lib/Command/UpdateAccount.php
 nc_mail/lib/Db/MailAccountMapper.php	AGPL-3.0-or-later	https://github.com/nextcloud/	https://raw.githubusercontent.com/nextcloud/mail/1e777a1783254bd4b7f69f39a6c5123323f8b701/lib/Db/MailAccountMapper.php

dd-apps/docker/nextcloud/nextcloud.yml

@@ -1,5 +1,6 @@
 #
 #   Copyright © 2021,2022 IsardVDI S.L.
+#   Copyright © 2023 Evilham <contact@evilham.com>
 #
 #   This file is part of DD
 #
@@ -37,7 +38,9 @@ services:
       - ${DATA_FOLDER}/saml/nextcloud:/saml:ro
       - ${DATA_FOLDER}/nc-mail-queue:/nc-mail-queue:rw
     environment:
+      # DD-specific settings
       - DOMAIN=${DOMAIN}
+      # General Nextcloud settings
       - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER}
       - NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD}
       - POSTGRES_DB=nextcloud
@@ -45,20 +48,37 @@ services:
       - POSTGRES_PASSWORD=${NEXTCLOUD_POSTGRES_PASSWORD}
       - POSTGRES_HOST=dd-apps-postgresql
       - REDIS_HOST=dd-apps-redis
-      - NC_overwriteprotocol=https
       - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.${DOMAIN}
+      # SMTP settings
+      - SMTP_HOST=${SMTP_HOST}
+      - SMTP_PORT=${SMTP_PORT}
+      - SMTP_SECURE=${SMTP_PROTOCOL}
+      - SMTP_NAME=${SMTP_USER}
+      - SMTP_PASSWORD=${SMTP_PASSWORD}
+      - MAIL_FROM_ADDRESS=${SMTP_LOCAL_PART}
+      - MAIL_DOMAIN=${SMTP_DOMAIN}
+      # PHP-specific settings
+      - PHP_UPLOAD_LIMIT=${NEXTCLOUD_UPLOAD_LIMIT-512M}
+      - PHP_MEMORY_LIMIT=${NEXTCLOUD_MEMORY_LIMIT-512M}
+      # Proxy-specific settings
+      - OVERWRITEPROTOCOL=https
     networks:
       - dd_net
 
   dd-apps-nextcloud-nginx:
-    image: ${NGINX_IMG-nginx:1.21.6}
+    image: ${NGINX_ALPINE_IMG-nginx:1.22.1-alpine}
     container_name: dd-apps-nextcloud-nginx
     restart: unless-stopped
     links:
       - dd-apps-nextcloud-app
     volumes:
+      # Customised nginx config
       - ${BUILD_APPS_ROOT_PATH}/docker/nextcloud/nginx.conf:/etc/nginx/nginx.conf:ro
+      # By mounting these, nginx can serve static files when possible
       - ${SRC_FOLDER}/nextcloud:/var/www/html:ro
+      - ${BUILD_APPS_ROOT_PATH}/docker/nextcloud/src/themes/dd:/var/www/html/themes/dd:ro
+    # This image does not require access to any environment variables
+    environment: []
     healthcheck:
         test: |
           curl -L --max-redirs 1 \

dd-apps/docker/nextcloud/nginx.conf

@@ -20,45 +20,42 @@ http {
     access_log  /var/log/nginx/access.log  main;
 
     sendfile        on;
+    #tcp_nopush     on;
+
+    # Prevent nginx HTTP Server Detection
+    server_tokens   off;
+
     keepalive_timeout  65;
 
+    #gzip  on;
+
+    # Pass Real IP to Nginx from proxy
     set_real_ip_from  10.0.0.0/8;
     set_real_ip_from  172.16.0.0/12;
     set_real_ip_from  192.168.0.0/16;
     real_ip_header    X-Forwarded-For;
+
     upstream php-handler {
+        # Pass request to DD container
         server dd-apps-nextcloud-app:9000;
     }
 
     server {
         listen 80;
-        add_header Referrer-Policy "no-referrer" always;
-        add_header X-Content-Type-Options "nosniff" always;
-        add_header X-Download-Options "noopen" always;
-        add_header X-Frame-Options "SAMEORIGIN" always;
-        add_header X-Permitted-Cross-Domain-Policies "none" always;
-        add_header X-Robots-Tag "none" always;
-        add_header X-XSS-Protection "1; mode=block" always;
-        fastcgi_hide_header X-Powered-By;
-        root /var/www/html;
 
-        location = /robots.txt {
+        # HSTS settings
-            allow all;
+        # WARNING: Only add the preload option once you read about
-            log_not_found off;
+        # the consequences in https://hstspreload.org/. This option
-            access_log off;
+        # will add the domain to a hardcoded list that is shipped
-        }
+        # in all major browsers and getting removed from this list
-
+        # could take several months.
-        location = /.well-known/carddav {
+        #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
-            return 301 $scheme://$host/remote.php/dav;
-        }
-
-        location = /.well-known/caldav {
-            return 301 $scheme://$host/remote.php/dav;
-        }
 
+        # set max upload size
         client_max_body_size 10G;
         fastcgi_buffers 64 4K;
 
+        # Enable gzip but do not remove ETag headers
         gzip on;
         gzip_vary on;
         gzip_comp_level 4;
@@ -66,53 +63,120 @@ http {
         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;
 
-        location / {
+        # Pagespeed is not supported by Nextcloud, so if your server is built
-            rewrite ^ /index.php;
+        # with the `ngx_pagespeed` module, uncomment this line to disable it.
+        #pagespeed off;
+
+        # HTTP response headers borrowed from Nextcloud `.htaccess`
+        add_header Referrer-Policy                      "no-referrer"   always;
+        add_header X-Content-Type-Options               "nosniff"       always;
+        add_header X-Download-Options                   "noopen"        always;
+        add_header X-Frame-Options                      "SAMEORIGIN"    always;
+        add_header X-Permitted-Cross-Domain-Policies    "none"          always;
+        add_header X-Robots-Tag                         "none"          always;
+        add_header X-XSS-Protection                     "1; mode=block" always;
+
+        # Remove X-Powered-By, which is an information leak
+        fastcgi_hide_header X-Powered-By;
+
+        # Path to the root of your installation
+        root /var/www/html;
+
+        # Specify how to handle directories -- specifying `/index.php$request_uri`
+        # here as the fallback means that Nginx always exhibits the desired behaviour
+        # when a client requests a path that corresponds to a directory that exists
+        # on the server. In particular, if that directory contains an index.php file,
+        # that file is correctly served; if it doesn't, then the request is passed to
+        # the front-end controller. This consistent behaviour means that we don't need
+        # to specify custom rules for certain paths (e.g. images and other assets,
+        # `/updater`, `/ocm-provider`, `/ocs-provider`), and thus
+        # `try_files $uri $uri/ /index.php$request_uri`
+        # always provides the desired behaviour.
+        index index.php index.html /index.php$request_uri;
+
+        # Rule borrowed from `.htaccess` to handle Microsoft DAV clients
+        location = / {
+            if ( $http_user_agent ~ ^DavClnt ) {
+                return 302 /remote.php/webdav/$is_args$args;
+            }
         }
 
-        location ~ ^\/(?:build|tests|config|lib|3rdparty|templates|data)\/ {
+        location = /robots.txt {
-            deny all;
+            allow all;
-        }
+            log_not_found off;
-        location ~ ^\/(?:\.|autotest|occ|issue|indie|db_|console) {
+            access_log off;
-            deny all;
         }
 
-        location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+)\.php(?:$|\/) {
+        # Make a regex exception for `/.well-known` so that clients can still
-            fastcgi_split_path_info ^(.+?\.php)(\/.*|)$;
+        # access it despite the existence of the regex rule
+        # `location ~ /(\.|autotest|...)` which would otherwise handle requests
+        # for `/.well-known`.
+        location ^~ /.well-known {
+            # The rules in this block are an adaptation of the rules
+            # in `.htaccess` that concern `/.well-known`.
+
+            # TODO: Test if this works fine with port / host / etc.
+            location = /.well-known/carddav { return 301 /remote.php/dav/; }
+            location = /.well-known/caldav  { return 301 /remote.php/dav/; }
+
+            location /.well-known/acme-challenge    { try_files $uri $uri/ =404; }
+            location /.well-known/pki-validation    { try_files $uri $uri/ =404; }
+
+            # Let Nextcloud's API for `/.well-known` URIs handle all other
+            # requests by passing them to the front-end controller.
+            return 301 /index.php$request_uri;
+        }
+
+        # Rules borrowed from `.htaccess` to hide certain paths from clients
+        location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)  { return 404; }
+        location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console)                { return 404; }
+
+        # Ensure this block, which passes PHP files to the PHP process, is above the blocks
+        # which handle static assets (as seen below). If this block is not declared first,
+        # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php`
+        # to the URI, resulting in a HTTP 500 error response.
+        location ~ \.php(?:$|/) {
+            # Required for legacy support
+            rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;
+
+            fastcgi_split_path_info ^(.+?\.php)(/.*)$;
             set $path_info $fastcgi_path_info;
+
             try_files $fastcgi_script_name =404;
+
             include fastcgi_params;
             fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
             fastcgi_param PATH_INFO $path_info;
-            fastcgi_param modHeadersAvailable true;
+            #fastcgi_param HTTPS on;
-            fastcgi_param front_controller_active true;
+
+            fastcgi_param modHeadersAvailable true;         # Avoid sending the security headers twice
+            fastcgi_param front_controller_active true;     # Enable pretty urls
             fastcgi_pass php-handler;
+
             fastcgi_intercept_errors on;
             fastcgi_request_buffering off;
             fastcgi_param SERVER_NAME $host;
         }
 
-        location ~ ^\/(?:updater|oc[ms]-provider)(?:$|\/) {
+        location ~ \.(?:css|js|svg|gif|map)$ {
-            try_files $uri/ =404;
+            try_files $uri /index.php$request_uri;
-            index index.php;
+            expires 6M;         # Cache-Control policy borrowed from `.htaccess`
+            access_log off;     # Optional: Don't log access to assets
         }
 
-        location ~ \.(?:css|js|woff2?|svg|gif|map)$ {
+        location ~ \.(?:woff2?|png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$ {
             try_files $uri /index.php$request_uri;
-            add_header Cache-Control "public, max-age=15778463";
+            expires 7d;         # Cache-Control policy borrowed from `.htaccess`
-            add_header Referrer-Policy "no-referrer" always;
+            access_log off;     # Optional: Don't log access to assets
-            add_header X-Content-Type-Options "nosniff" always;
-            add_header X-Download-Options "noopen" always;
-            add_header X-Frame-Options "SAMEORIGIN" always;
-            add_header X-Permitted-Cross-Domain-Policies "none" always;
-            add_header X-Robots-Tag "none" always;
-            add_header X-XSS-Protection "1; mode=block" always;
-            access_log off;
         }
 
-        location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$ {
+        # Rule borrowed from `.htaccess`
-            try_files $uri /index.php$request_uri;
+        location /remote {
-            access_log off;
+            return 301 /remote.php$request_uri;
+        }
+
+        location / {
+            try_files $uri $uri/ /index.php$request_uri;
         }
     }
 }

dd-apps/docker/nextcloud/supervisord.conf

@@ -3,8 +3,8 @@ nodaemon=true
 logfile=/var/log/supervisord/supervisord.log
 pidfile=/var/run/supervisord/supervisord.pid
 childlogdir=/var/log/supervisord/
-logfile_maxbytes=50MB
+logfile_maxbytes=50MB                           ; maximum size of logfile before rotation
-logfile_backups=10
+logfile_backups=10                              ; number of backed up logfiles
 loglevel=error
 
 [program:php-fpm]
@@ -19,4 +19,4 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
-command=/cron.sh
+command=/cron.sh