From 186a8400ed80f08d977d8c2d94644d4027b11f45 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 25 Jul 2016 15:10:36 +0000
Subject: nginx module: make httpConfig backward compatible

---
 nixos/modules/services/web-servers/nginx/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'nixos/modules')

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index b3889cb02946..6b6ad0d9b985 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -70,8 +70,14 @@ let
 
       server_tokens ${if cfg.serverTokens then "on" else "off"};
       ${vhosts}
+    }
+    ${optionalString (cfg.httpConfig != "") ''
+    http {
+      include ${cfg.package}/conf/mime.types;
+      include ${cfg.package}/conf/fastcgi.conf;
       ${cfg.httpConfig}
     }
+    ''}
     ${cfg.appendConfig}
   '';
 
-- 
cgit 1.4.1