movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 20:55:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

nginx: fixed duplicate http declaration

Browse source
This commit is contained in:
Tristan Helmich 2016-07-26 18:11:16 +02:00 • committed by Robin Gloster
parent 91680de317
commit 8c61b3af03
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,8 @@ let
error_log stderr; error_log stderr;
daemon off; daemon off;
${cfg.config}
http { http {
include ${cfg.package}/conf/mime.types; include ${cfg.package}/conf/mime.types;
include ${cfg.package}/conf/fastcgi.conf; include ${cfg.package}/conf/fastcgi.conf;
@ -86,18 +88,10 @@ let
} }
} }
''} ''}
}
${cfg.config}
# Keep this seperate to allow overriding previous settings
${optionalString (cfg.httpConfig != "") ''
http {
include ${cfg.package}/conf/mime.types;
include ${cfg.package}/conf/fastcgi.conf;
${cfg.httpConfig} ${cfg.httpConfig}
} }
''}
${cfg.appendConfig} ${cfg.appendConfig}
''; '';