ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18961 from wlhlm/nginx-events

Browse Source 
Allow configuration of events{} block in nginx module
This commit is contained in:
zimbatm 2016-09-26 13:41:54 +01:00 committed by GitHub
commit ff980cc553
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,9 +18,13 @@ let
${cfg.config}
${optionalString (cfg.httpConfig == "" && cfg.config == "") ''
events {}
${optionalString (cfg.eventsConfig != "" || cfg.config == "") ''
events {
${cfg.eventsConfig}
}
''}
${optionalString (cfg.httpConfig == "" && cfg.config == "") ''
http {
include ${cfg.package}/conf/mime.types;
include ${cfg.package}/conf/fastcgi.conf;
@ -98,7 +102,6 @@ let
}''}
${optionalString (cfg.httpConfig != "") ''
events {}
http {
include ${cfg.package}/conf/mime.types;
include ${cfg.package}/conf/fastcgi.conf;
@ -272,12 +275,20 @@ in
";
};
eventsConfig = mkOption {
type = types.lines;
default = "";
description = ''
Configuration lines to be set inside the events block.
'';
};
appendHttpConfig = mkOption {
type = types.lines;
default = "";
description = "
Configuration lines to be appended to the generated http block.
This is mutually exclusive with using config and httpConfig for
This is mutually exclusive with using config and httpConfig for
specifying the whole http block verbatim.
";
};