Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 18b5ca29f505
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8e1fdad7c69a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 9, 2019

  1. Copy the full SHA
    2d0b34a View commit details
  2. Merge pull request #70858 from manveru/nginx-map-hash-sizes

    nginx: add map_hash_*_size options
    globin authored Oct 9, 2019
    Copy the full SHA
    8e1fdad View commit details
Showing with 25 additions and 0 deletions.
  1. +25 −0 nixos/modules/services/web-servers/nginx/default.nix
25 changes: 25 additions & 0 deletions nixos/modules/services/web-servers/nginx/default.nix
Original file line number Diff line number Diff line change
@@ -122,6 +122,14 @@ let
include ${recommendedProxyConfig};
''}
${optionalString (cfg.mapHashBucketSize != null) ''
map_hash_bucket_size ${toString cfg.mapHashBucketSize};
''}
${optionalString (cfg.mapHashMaxSize != null) ''
map_hash_max_size ${toString cfg.mapHashMaxSize};
''}
# $connection_upgrade is used for websocket proxying
map $http_upgrade $connection_upgrade {
default upgrade;
@@ -510,6 +518,23 @@ in
'';
};

mapHashBucketSize = mkOption {
type = types.nullOr (types.enum [ 32 64 128 ]);
default = null;
description = ''
Sets the bucket size for the map variables hash tables. Default
value depends on the processor’s cache line size.
'';
};

mapHashMaxSize = mkOption {
type = types.nullOr types.ints.positive;
default = null;
description = ''
Sets the maximum size of the map variables hash tables.
'';
};

resolver = mkOption {
type = types.submodule {
options = {