dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #272920 from SuperSandro2000/nginx-return

Browse Source
This commit is contained in:
Ryan Lahfa 2023-12-10 19:38:18 +01:00 committed by GitHub
commit c36344b125
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -449,7 +449,7 @@ let
${optionalString (config.tryFiles != null) "try_files ${config.tryFiles};"} ${optionalString (config.tryFiles != null) "try_files ${config.tryFiles};"}
${optionalString (config.root != null) "root ${config.root};"} ${optionalString (config.root != null) "root ${config.root};"}
${optionalString (config.alias != null) "alias ${config.alias};"} ${optionalString (config.alias != null) "alias ${config.alias};"}
${optionalString (config.return != null) "return ${config.return};"} ${optionalString (config.return != null) "return ${toString config.return};"}
${config.extraConfig} ${config.extraConfig}
${optionalString (config.proxyPass != null && config.recommendedProxySettings) "include ${recommendedProxyConfig};"} ${optionalString (config.proxyPass != null && config.recommendedProxySettings) "include ${recommendedProxyConfig};"}
${mkBasicAuth "sublocation" config} ${mkBasicAuth "sublocation" config}

2
nixos/modules/services/web-servers/nginx/location-options.nix
View File

@ -93,7 +93,7 @@ with lib;
}; };
return = mkOption { return = mkOption {
type = types.nullOr types.str; type = with types; nullOr (oneOf [ str int ]);
default = null; default = null;
example = "301 http://example.com$request_uri"; example = "301 http://example.com$request_uri";
description = lib.mdDoc '' description = lib.mdDoc ''