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

nginx module: fix cfg.config backwards compatibility

Browse source 
fixes #17604
This commit is contained in:
Robin Gloster 2016-08-09 11:59:10 +00:00
parent 199f5a2844
commit b0b0a45bb1
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,7 @@ let
${cfg.config}
${optionalString (cfg.httpConfig == "") ''
${optionalString (cfg.httpConfig == "" && cfg.config == "") ''
http {
include ${cfg.package}/conf/mime.types;
include ${cfg.package}/conf/fastcgi.conf;
@ -233,9 +233,12 @@ in
};
config = mkOption {
default = "events {}";
default = "";
description = "
Verbatim nginx.conf configuration.
This is mutually exclusive with the structured configuration
via virtualHosts and the recommendedXyzSettings configuration
options. See appendConfig for appending to the generated http block.
";
};
@ -268,8 +271,8 @@ in
default = "";
description = "
Configuration lines to be appended to the generated http block.
This is mutually exclusive with using httpConfig for specifying the whole
http block verbatim.
This is mutually exclusive with using config and httpConfig for
specifying the whole http block verbatim.
";
};