Unverified Commit 600adcfd authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #187994 from Izorkin/update-nginx-gzip

parents ba0f7ba3 d178a1d7

nixos/doc/manual/from_md/release-notes/rl-2305.section.xml

+30 −0
Original line number Diff line number Diff line
@@ -697,6 +697,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>

nixos/doc/manual/release-notes/rl-2305.section.md

+6 −0
Original line number Diff line number Diff line
@@ -179,6 +179,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`.

nixos/modules/services/web-servers/nginx/default.nix

+6 −14
Original line number Diff line number Diff line
@@ -184,25 +184,17 @@ 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/

      ${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 ''