commit 995f9d1c95c6a5f5b4737ba11ad6f3daa6945019 · pyrox.dev/nixpkgs

+21 -2

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

···

       184
       184
        
               brotli_types ${lib.concatStringsSep " " compressMimeTypes};

     

       185
       185
        
             ''}

     

       186
       186
        
       

     

       187
       187
       -
             # https://docs.nginx.com/nginx/admin-guide/web-server/compression/

     

       188
       187
        
             ${optionalString cfg.recommendedGzipSettings ''

     

       188
       188
       +
               # https://docs.nginx.com/nginx/admin-guide/web-server/compression/

     

       189
       189
        
               gzip on;

     

       190
       190
        
               gzip_static on;

     

       191
       191
        
               gzip_vary on;

     
···

       193
       193
        
               gzip_min_length 256;

     

       194
       194
        
               gzip_proxied expired no-cache no-store private auth;

     

       195
       195
        
               gzip_types ${lib.concatStringsSep " " compressMimeTypes};

     

       196
       196
       +
             ''}

     

       197
       197
       +
       

     

       198
       198
       +
             ${optionalString cfg.recommendedZstdSettings ''

     

       199
       199
       +
               zstd on;

     

       200
       200
       +
               zstd_comp_level 9;

     

       201
       201
       +
               zstd_min_length 256;

     

       202
       202
       +
               zstd_static on;

     

       203
       203
       +
               zstd_types ${lib.concatStringsSep " " compressMimeTypes};

     

       196
       204
        
             ''}

     

       197
       205
        
       

     

       198
       206
        
             ${optionalString cfg.recommendedProxySettings ''

     
···

       487
       495
        
               type = types.bool;

     

       488
       496
        
               description = lib.mdDoc ''

     

       489
       497
        
                 Whether to enable recommended proxy settings if a vhost does not specify the option manually.

     

       498
       498
       +
               '';

     

       499
       499
       +
             };

     

       500
       500
       +
       

     

       501
       501
       +
             recommendedZstdSettings = mkOption {

     

       502
       502
       +
               default = false;

     

       503
       503
       +
               type = types.bool;

     

       504
       504
       +
               description = lib.mdDoc ''

     

       505
       505
       +
                 Enable recommended zstd settings. Learn more about compression in Zstd format [here](https://github.com/tokers/zstd-nginx-module).

     

       506
       506
       +
       

     

       507
       507
       +
                 This adds `pkgs.nginxModules.zstd` to `services.nginx.additionalModules`.

     

       490
       508
        
               '';

     

       491
       509
        
             };

     

       492
       510
        
       

     
···

       1015
       1033
        
             groups = config.users.groups;

     

       1016
       1034
        
           }) dependentCertNames;

     

       1017
       1035
        
       

     

       1018
       1018
       -
           services.nginx.additionalModules = optional cfg.recommendedBrotliSettings pkgs.nginxModules.brotli;

     

       1036
       1036
       +
           services.nginx.additionalModules = optional cfg.recommendedBrotliSettings pkgs.nginxModules.brotli

     

       1037
       1037
       +
             ++ lib.optional cfg.recommendedZstdSettings pkgs.nginxModules.zstd;

     

       1019
       1038
        
       

     

       1020
       1039
        
           systemd.services.nginx = {

     

       1021
       1040
        
             description = "Nginx Web Server";

+14

pkgs/servers/http/nginx/modules.nix

···

       29
       29
        
       , which

     

       30
       30
        
       , yajl

     

       31
       31
        
       , zlib

     

       32
       32
       +
       , zstd

     

       32
       33
        
       }:

     

       33
       34
        
       

     

       34
       35
        
       let

     
···

       665
       666
        
             rev = "v0.2.1";

     

       666
       667
        
             sha256 = "sha256-x4ry5ljPeJQY+7Mp04/xYIGf22d6Nee7CSqHezdK4gQ=";

     

       667
       668
        
           };

     

       669
       669
       +
         };

     

       670
       670
       +
       

     

       671
       671
       +
         zstd = {

     

       672
       672
       +
           name = "zstd";

     

       673
       673
       +
           src = fetchFromGitHub {

     

       674
       674
       +
             name = "zstd";

     

       675
       675
       +
             owner = "tokers";

     

       676
       676
       +
             repo = "zstd-nginx-module";

     

       677
       677
       +
             rev = "25d88c262be47462cf90015ee7ebf6317b6848f9";

     

       678
       678
       +
             sha256 = "sha256-YRluKekhx1tb6e5IL1FPK05jPtzfQPaHI47cdada928=";

     

       679
       679
       +
           };

     

       680
       680
       +
       

     

       681
       681
       +
           inputs = [ zstd ];

     

       668
       682
        
         };

     

       669
       683
        
       }; in self // lib.optionalAttrs config.allowAliases {

     

       670
       684
        
         # deprecated or renamed packages