monitoring/docker-compose.yaml

@@ -112,7 +112,6 @@ services:
       - "${VOLUMES_PATH}/monitoring/diun/data:/data"
     networks:
       - dockersocket
-    hostname: ${HOSTNAME}
     environment:
       - "TZ=Europe/Berlin"
       - "DIUN_WATCH_WORKERS=10"

nextcloud/docker-compose.yaml

@@ -1,7 +1,7 @@
 services:
 
   web:
-    image: nginx:stable
+    image: nginx
     depends_on:
       - app
     volumes:

nextcloud/nginx.conf

@@ -10,7 +10,7 @@ events {
 
 
 http {
-    include mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
@@ -27,12 +27,6 @@ http {
 
     keepalive_timeout  65;
 
-    # Set the `immutable` cache control options only for assets with a cache busting `v` argument
-    map $arg_v $asset_immutable {
-        "" "";
-    default "immutable";
-    }
-
     #gzip  on;
 
     upstream php-handler {
@@ -42,39 +36,19 @@ http {
     server {
         listen 80;
 
-        # HSTS settings
+        # Add headers to serve security related headers
+        # Before enabling Strict-Transport-Security headers please read into this
+        # topic first.
+        #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
+        #
         # WARNING: Only add the preload option once you read about
         # the consequences in https://hstspreload.org/. This option
         # 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.
-        #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
-
-        # set max upload size and increase upload timeout:
-        client_max_body_size 512M;
-        client_body_timeout 300s;
-        fastcgi_buffers 64 4K;
-
-        # The settings allows you to optimize the HTTP2 bandwidth.
-        # See https://blog.cloudflare.com/delivering-http-2-upload-speed-improvements/
-        # for tuning hints
-        client_body_buffer_size 512k;
-
-        # 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 text/javascript application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/wasm 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;
-
-        # Pagespeed is not supported by Nextcloud, so if your server is built
-        # 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 "noindex, nofollow" always;
@@ -86,25 +60,6 @@ http {
         # 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 https://$host:443/remote.php/webdav/$is_args$args;
-            }
-        }
-
         location = /robots.txt {
             allow all;
             log_not_found off;
@@ -116,90 +71,97 @@ http {
         # `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`.
-
             location = /.well-known/carddav     { return 301 https://$host:443/remote.php/dav; }
             location = /.well-known/caldav      { return 301 https://$host:443/remote.php/dav; }
+            # Anything else is dynamically handled by Nextcloud
+            location ^~ /.well-known            { return 301 https://$host:443/index.php$uri; }
 
-            location /.well-known/acme-challenge    { try_files $uri $uri/ =404; }
+            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 https://$host:443/index.php$request_uri; 
     }
 
-        # Rules borrowed from `.htaccess` to hide certain paths from clients
+        # set max upload size
-        location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)  { return 404; }
+        client_max_body_size 10G;
-        location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console)                { return 404; }
+        fastcgi_buffers 64 4K;
 
-        # Ensure this block, which passes PHP files to the PHP process, is above the blocks
+        # Enable gzip but do not remove ETag headers
-        # which handle static assets (as seen below). If this block is not declared first,
+        gzip on;
-        # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php`
+        gzip_vary on;
-        # to the URI, resulting in a HTTP 500 error response.
+        gzip_comp_level 4;
-        location ~ \.php(?:$|/) {
+        gzip_min_length 256;
-            # Required for legacy support
+        gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
-            rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;
+        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;
 
-            fastcgi_split_path_info ^(.+?\.php)(/.*)$;
+        # Uncomment if your server is build with the ngx_pagespeed module
+        # This module is currently not supported.
+        #pagespeed off;
+
+        location / {
+            rewrite ^ /index.php;
+        }
+
+        location ~ ^\/(?:build|tests|config|lib|3rdparty|templates|data)\/ {
+            deny all;
+        }
+        location ~ ^\/(?:\.|autotest|occ|issue|indie|db_|console) {
+            deny all;
+        }
+
+        location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+)\.php(?:$|\/) {
+            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 HTTPS on;
+            # fastcgi_param HTTPS on;
 
-            fastcgi_param modHeadersAvailable true;         # Avoid sending the security headers twice
+            # Avoid sending the security headers twice
-            fastcgi_param front_controller_active true;     # Enable pretty urls
+            fastcgi_param modHeadersAvailable true;
+
+            # Enable pretty urls
+            fastcgi_param front_controller_active true;
             fastcgi_pass php-handler;
-
             fastcgi_intercept_errors on;
             fastcgi_request_buffering off;
-
-            fastcgi_max_temp_file_size 0;
         }
 
-        # Javascript mimetype fixes for nginx
+        location ~ ^\/(?:updater|oc[ms]-provider)(?:$|\/) {
-        # Note: The block below should be removed, and the js|mjs section should be
+            try_files $uri/ =404;
-        # added to the block below this one. This is a temporary fix until Nginx 
+            index index.php;
-        # upstream fixes the js mime-type
-        location ~* \.(?:js|mjs)$ {
-            types { 
-                text/javascript js mjs;
         }
-            default_type "text/javascript";
+
+        # Adding the cache control header for js, css and map files
+        # Make sure it is BELOW the PHP block
+        location ~ \.(?:css|js|woff2?|svg|gif|map)$ {
             try_files $uri /index.php$request_uri;
-            add_header Cache-Control "public, max-age=15778463, $asset_immutable";
+            add_header Cache-Control "public, max-age=15778463";
+            # Add headers to serve security related headers (It is intended to
+            # have those duplicated to the ones above)
+            # Before enabling Strict-Transport-Security headers please read into
+            # this topic first.
+            #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
+            #
+            # WARNING: Only add the preload option once you read about
+            # the consequences in https://hstspreload.org/. This option
+            # 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.
+            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;
+
+            # Optional: Don't log access to assets
             access_log off;
         }
 
-        # Serve static files
+        location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$ {
-        location ~ \.(?:css|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
             try_files $uri /index.php$request_uri;
-            add_header Cache-Control "public, max-age=15778463, $asset_immutable";
+            # Optional: Don't log access to other assets
-            access_log off;     # Optional: Don't log access to assets
+            access_log off;
-
-            location ~ \.wasm$ {
-                default_type application/wasm;
-            }
-        }
-
-        location ~ \.woff2?$ {
-            try_files $uri /index.php$request_uri;
-            expires 7d;         # Cache-Control policy borrowed from `.htaccess`
-            access_log off;     # Optional: Don't log access to assets
-        }
-
-        # Rule borrowed from `.htaccess`
-        location /remote {
-            return 301 https://$host:443/remote.php$request_uri;
-        }
-
-        location / {
-            try_files $uri $uri/ /index.php$request_uri;
         }
     }
 }

nextcloud/update-nc.sh

@@ -1,19 +1,11 @@
-#/bin/bash/
-
-function occ {
-   docker compose --project-directory /home/flz/git/selfhost/nextcloud exec --user www-data app php occ "$@"
-}
-
-
 #docker compose build --pull
 #docker compose pull --ignore-buildable
-#occ status
+#docker compose --project-directory /home/flz/git/selfhost/nextcloud exec --user www-data app php occ status
 #docker compose up -d
 #watch docker compose ps
-
+docker compose --project-directory /home/flz/git/selfhost/nextcloud exec --user www-data app php occ upgrade
-occ upgrade
+docker compose --project-directory /home/flz/git/selfhost/nextcloud exec --user www-data app php occ maintenance:repair
-occ maintenance:repair
+docker compose --project-directory /home/flz/git/selfhost/nextcloud exec --user www-data app php occ db:add-missing-indices
-occ db:add-missing-indices
+docker compose --project-directory /home/flz/git/selfhost/nextcloud exec --user www-data app php occ db:add-missing-columns
-occ db:add-missing-columns
+docker compose --project-directory /home/flz/git/selfhost/nextcloud exec --user www-data app php occ db:add-missing-primary-keys
-occ db:add-missing-primary-keys
+docker compose --project-directory /home/flz/git/selfhost/nextcloud exec --user www-data app php occ status
-occ status

proxy/docker-compose.yaml

@@ -79,17 +79,17 @@ services:
     privileged: true
 
 
-#  whoami:
+  whoami:
-#    image: traefik/whoami
+    image: traefik/whoami
-#    networks:
+    networks:
-#      - web
+      - web
-#    labels:
+    labels:
-#      - "traefik.enable=true"
+      - "traefik.enable=true"
-#      - "traefik.http.routers.whoami.rule=Host(`whoami.${DOMAIN}`)"
+      - "traefik.http.routers.whoami.rule=Host(`whoami.${DOMAIN}`)"
-#      - "traefik.http.routers.whoami.entrypoints=websecure"
+      - "traefik.http.routers.whoami.entrypoints=websecure"
-#      - "traefik.http.routers.whoami.tls.certresolver=netcup"
+      - "traefik.http.routers.whoami.tls.certresolver=netcup"
-#      - "docker.group=proxy"
+      - "docker.group=proxy"
-#    restart: unless-stopped
+    restart: unless-stopped
 
 
 networks:

start-all.sh

@@ -4,8 +4,7 @@ function up {
    (cd "$1" && echo "[$1]" && docker compose up -d "${@:2}");
 }
 
-#up proxy --scale whoami=3;
+up proxy --scale whoami=3;
-up proxy;
 up monitoring;
 up nextcloud;
 up git;

www/docker-compose.yaml

@@ -1,7 +1,7 @@
 services:
 
   app:
-    image: nginx:stable
+    image: nginx
     volumes:
       - ${HTML}:/usr/share/nginx/html:ro
     networks: