alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #176979 from winterqt/nginx-per-location-recommended-proxy-settings

Browse source 
nixos/nginx: allow recommended proxy settings to be enabled per location
This commit is contained in:
Bernardo Meurer 2022-06-25 23:48:29 -07:00 committed by GitHub
parent 582e897fac 6c53004840
commit 83801da137
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/web-servers/nginx/default.nix
View file

@ -360,7 +360,7 @@ let
${optionalString (config.alias != null) "alias ${config.alias};"}
${optionalString (config.return != null) "return ${config.return};"}
${config.extraConfig}
${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"}
${optionalString (config.proxyPass != null && config.recommendedProxySettings) "include ${recommendedProxyConfig};"}
${mkBasicAuth "sublocation" config}
}
'') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations)));
@ -423,7 +423,7 @@ in
default = false;
type = types.bool;
description = "
Enable recommended proxy settings.
Whether to enable recommended proxy settings if a vhost does not specify the option manually.
";
};

11
nixos/modules/services/web-servers/nginx/location-options.nix
View file

@ -3,7 +3,7 @@
# has additional options that affect the web server as a whole, like
# the user/group to run under.)
{ lib }:
{ lib, config }:
with lib;
@ -128,5 +128,14 @@ with lib;
a greater priority.
'';
};
recommendedProxySettings = mkOption {
type = types.bool;
default = config.services.nginx.recommendedProxySettings;
defaultText = literalExpression "config.services.nginx.recommendedProxySettings";
description = ''
Enable recommended proxy settings.
'';
};
};
}

2
nixos/modules/services/web-servers/nginx/vhost-options.nix
View file

@ -281,7 +281,7 @@ with lib;
locations = mkOption {
type = types.attrsOf (types.submodule (import ./location-options.nix {
inherit lib;
inherit lib config;
}));
default = {};
example = literalExpression ''