diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-02-11 04:51:24 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-08-30 21:01:52 +0200 |
| commit | 759daba9801af7cceb62674488129c223dc22f70 (patch) | |
| tree | 3c406f503077dd7d43b5266bd0c814628ee6e4fa /nixos/modules/services/web-servers | |
| parent | 65c2203ffcedcf4817c590fe82c213dd45602d47 (diff) | |
| download | nixlib-759daba9801af7cceb62674488129c223dc22f70.tar nixlib-759daba9801af7cceb62674488129c223dc22f70.tar.gz nixlib-759daba9801af7cceb62674488129c223dc22f70.tar.bz2 nixlib-759daba9801af7cceb62674488129c223dc22f70.tar.lz nixlib-759daba9801af7cceb62674488129c223dc22f70.tar.xz nixlib-759daba9801af7cceb62674488129c223dc22f70.tar.zst nixlib-759daba9801af7cceb62674488129c223dc22f70.zip | |
nginx module: first proxy_set_header takes precendence
Diffstat (limited to 'nixos/modules/services/web-servers')
| -rw-r--r-- | nixos/modules/services/web-servers/nginx/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index e71a9e1885a8..93339c075cad 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -214,10 +214,7 @@ let ) virtualHosts); mkLocations = locations: concatStringsSep "\n" (mapAttrsToList (location: config: '' location ${location} { - ${optionalString (config.proxyPass != null) '' - proxy_pass ${config.proxyPass}; - ${optionalString cfg.recommendedProxySettings "include ${recommendedProxyConfig};"} - ''} + ${optionalString (config.proxyPass != null) "proxy_pass ${config.proxyPass};"} ${optionalString config.proxyWebsockets '' proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; @@ -228,6 +225,7 @@ let ${optionalString (config.root != null) "root ${config.root};"} ${optionalString (config.alias != null) "alias ${config.alias};"} ${config.extraConfig} + ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"} } '') locations); mkBasicAuth = vhostName: authDef: let |