From ee7e096c488cca19f3bceb98339ea00da7329498 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 23 Aug 2022 12:21:32 +0300
Subject: [PATCH 1/2] nixos/nginx: update recommended gzip settings
---
.../from_md/release-notes/rl-2305.section.xml | 30 +++++++++++++++++++
.../manual/release-notes/rl-2305.section.md | 6 ++++
.../services/web-servers/nginx/default.nix | 19 ++++--------
3 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
index 2ce4ce189cb4..527c7e50f3a3 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
@@ -680,6 +680,36 @@
<link xlink:href="https://github.com/google/ngx_brotli/blob/master/README.md">here</link>.
</para>
</listitem>
+ <listitem>
+ <para>
+ Updated recommended settings in
+ <literal>services.nginx.recommendedGzipSettings</literal>:
+ </para>
+ <itemizedlist spacing="compact">
+ <listitem>
+ <para>
+ Enables gzip compression for only certain proxied
+ requests.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Allow checking and loading of precompressed files.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Updated gzip mime-types.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Increased the minimum length of a response that will be
+ gzipped.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para>
<link xlink:href="https://garagehq.deuxfleurs.fr/">Garage</link>
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index 148b317ba283..295446137096 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -172,6 +172,12 @@ In addition to numerous new and upgraded packages, this release has the followin
- A new option `recommendedBrotliSettings` has been added to `services.nginx`. Learn more about compression in Brotli format [here](https://github.com/google/ngx_brotli/blob/master/README.md).
+- Updated recommended settings in `services.nginx.recommendedGzipSettings`:
+ - Enables gzip compression for only certain proxied requests.
+ - Allow checking and loading of precompressed files.
+ - Updated gzip mime-types.
+ - Increased the minimum length of a response that will be gzipped.
+
- [Garage](https://garagehq.deuxfleurs.fr/) version is based on [system.stateVersion](options.html#opt-system.stateVersion), existing installations will keep using version 0.7. New installations will use version 0.8. In order to upgrade a Garage cluster, please follow [upstream instructions](https://garagehq.deuxfleurs.fr/documentation/cookbook/upgrading/) and force [services.garage.package](options.html#opt-services.garage.package) or upgrade accordingly [system.stateVersion](options.html#opt-system.stateVersion).
- `hip` has been separated into `hip`, `hip-common` and `hipcc`.
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index c723b962c847..298c85108c3d 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -187,22 +187,15 @@ let
brotli_buffers 32 8k;
''}
+ # https://docs.nginx.com/nginx/admin-guide/web-server/compression/
${optionalString cfg.recommendedGzipSettings ''
gzip on;
- gzip_proxied any;
- gzip_comp_level 5;
- gzip_types
- application/atom+xml
- application/javascript
- application/json
- application/xml
- application/xml+rss
- image/svg+xml
- text/css
- text/javascript
- text/plain
- text/xml;
+ gzip_static on;
gzip_vary on;
+ gzip_comp_level 5;
+ gzip_min_length 256;
+ gzip_proxied expired no-cache no-store private auth;
+ gzip_types ${lib.concatStringsSep " " compressMimeTypes};
''}
${optionalString cfg.recommendedProxySettings ''
From d178a1d7a13696376d9439b04571983551221d13 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 30 Jan 2023 23:13:12 +0300
Subject: [PATCH 2/2] nixos/nginx: update recommended brotli settings
---
nixos/modules/services/web-servers/nginx/default.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 298c85108c3d..4ea0a64aba84 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -184,7 +184,6 @@ let
brotli_window 512k;
brotli_min_length 256;
brotli_types ${lib.concatStringsSep " " compressMimeTypes};
- brotli_buffers 32 8k;
''}
# https://docs.nginx.com/nginx/admin-guide/web-server/compression/