diff --git a/Containers/apache/Caddyfile b/Containers/apache/Caddyfile index 275dbd1e..a9169a89 100644 --- a/Containers/apache/Caddyfile +++ b/Containers/apache/Caddyfile @@ -25,6 +25,8 @@ http://{$APACHE_HOST}.nextcloud-aio:23973, # For Collabora callback and WOPI req -Via } + encode + # Collabora route /browser/* { reverse_proxy {$COLLABORA_HOST}:9980 diff --git a/Containers/apache/Dockerfile b/Containers/apache/Dockerfile index e0e32bef..cc87763f 100644 --- a/Containers/apache/Dockerfile +++ b/Containers/apache/Dockerfile @@ -47,7 +47,6 @@ RUN set -ex; \ -e 's/^#\(LoadModule .*mod_authz_core.so\)/\1/' \ -e 's/^#\(LoadModule .*mod_alias.so\)/\1/' \ -e 's/^#\(LoadModule .*mod_mpm_event.so\)/\1/' \ - -e 's/^#\(LoadModule .*mod_brotli.so\)/\1/' \ -e 's/^#\(LoadModule .*mod_reqtimeout.so\)/\1/' \ -e 's/\(LoadModule .*mod_mpm_worker.so\)/#\1/' \ -e 's/\(LoadModule .*mod_mpm_prefork.so\)/#\1/' \ diff --git a/Containers/apache/nextcloud.conf b/Containers/apache/nextcloud.conf index aa63d75b..b09e86b1 100644 --- a/Containers/apache/nextcloud.conf +++ b/Containers/apache/nextcloud.conf @@ -17,14 +17,6 @@ Listen 8000 - # Compress JS, CSS and SVG responses with Brotli. - # Other plain-text files are already compressed by Nextcloud itself. - # Desktop and mobile sync clients never request JS/CSS/SVG assets. - - AddOutputFilterByType BROTLI_COMPRESS text/javascript application/javascript application/x-javascript text/css image/svg+xml - BrotliCompressionQuality 0 - - # Nextcloud dir DocumentRoot /var/www/html/ diff --git a/readme.md b/readme.md index 5802fe79..7de9a802 100644 --- a/readme.md +++ b/readme.md @@ -40,7 +40,7 @@ Included are: - PHP and web server timeouts set to 3600s, [adjustable](https://github.com/nextcloud/all-in-one#how-to-adjust-the-max-execution-time-for-nextcloud) (important for big file uploads) - Defaults to a max of 512 MB RAM per PHP process, [adjustable](https://github.com/nextcloud/all-in-one#how-to-adjust-the-php-memory-limit-for-nextcloud) - Automatic TLS included (by using Let's Encrypt) -- Brotli compression enabled by default for javascript, css and svg files which reduces Nextcloud load times +- zstd/gzip compression enabled by default inside caddy inside the apache container - HTTP/2 and HTTP/3 enabled - "Pretty URLs" for Nextcloud are enabled by default (removes the index.php from all links) - Video previews work out of the box and when Imaginary is enabled, many recent image formats as well!