summaryrefslogtreecommitdiffstats
path: root/nixos
diff options
context:
space:
mode:
authorTristan Helmich <tristan.helmich@gmail.com>2016-07-26 18:11:16 +0200
committerRobin Gloster <mail@glob.in>2016-07-28 11:59:13 +0000
commit8c61b3af0398b1ec93d2abb2b80fa97099155b1c (patch)
tree6a367bbf3b2453b119cf648956fcac4ff9569e28 /nixos
parent91680de317b0a134c5a6b6bad441013aa6ed233a (diff)
nginx: fixed duplicate http declaration
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/web-servers/nginx/default.nix12
1 files changed, 3 insertions, 9 deletions
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 1e5a8b9bc357..d6b9836498d1 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -16,6 +16,8 @@ let
error_log stderr;
daemon off;
+ ${cfg.config}
+
http {
include ${cfg.package}/conf/mime.types;
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.appendConfig}
'';