diff options
| author | Ryan Lahfa <masterancpp@gmail.com> | 2023-12-10 19:38:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-10 19:38:18 +0100 |
| commit | c36344b125d47f21cb146f713a7c5241b1c8fa4e (patch) | |
| tree | edd45599d0c255f7c6fa86044b7f99b0e4de9e5e /nixos/modules | |
| parent | cfe951f8fdefab98b9ccb33ac9ffd4569338433c (diff) | |
| parent | 78541e68ebd88b29990296e9073e4b66f07e973d (diff) | |
| download | nixlib-c36344b125d47f21cb146f713a7c5241b1c8fa4e.tar nixlib-c36344b125d47f21cb146f713a7c5241b1c8fa4e.tar.gz nixlib-c36344b125d47f21cb146f713a7c5241b1c8fa4e.tar.bz2 nixlib-c36344b125d47f21cb146f713a7c5241b1c8fa4e.tar.lz nixlib-c36344b125d47f21cb146f713a7c5241b1c8fa4e.tar.xz nixlib-c36344b125d47f21cb146f713a7c5241b1c8fa4e.tar.zst nixlib-c36344b125d47f21cb146f713a7c5241b1c8fa4e.zip | |
Merge pull request #272920 from SuperSandro2000/nginx-return
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/web-servers/nginx/default.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/web-servers/nginx/location-options.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index cf70dc325945..eafaa32f5b9b 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -449,7 +449,7 @@ let ${optionalString (config.tryFiles != null) "try_files ${config.tryFiles};"} ${optionalString (config.root != null) "root ${config.root};"} ${optionalString (config.alias != null) "alias ${config.alias};"} - ${optionalString (config.return != null) "return ${config.return};"} + ${optionalString (config.return != null) "return ${toString config.return};"} ${config.extraConfig} ${optionalString (config.proxyPass != null && config.recommendedProxySettings) "include ${recommendedProxyConfig};"} ${mkBasicAuth "sublocation" config} diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix index 2728852058ea..2138e551fd43 100644 --- a/nixos/modules/services/web-servers/nginx/location-options.nix +++ b/nixos/modules/services/web-servers/nginx/location-options.nix @@ -93,7 +93,7 @@ with lib; }; return = mkOption { - type = types.nullOr types.str; + type = with types; nullOr (oneOf [ str int ]); default = null; example = "301 http://example.com$request_uri"; description = lib.mdDoc '' |