diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-25 15:10:36 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-28 11:59:13 +0000 |
| commit | 186a8400ed80f08d977d8c2d94644d4027b11f45 (patch) | |
| tree | b37d8a7c1517d25fa6eee8091e2d70c98633b0a9 /nixos/modules/services/web-servers | |
| parent | 5dd7cf964ac4f65b4d4ae35fcd7f553b7cbae1c0 (diff) | |
| download | nixlib-186a8400ed80f08d977d8c2d94644d4027b11f45.tar nixlib-186a8400ed80f08d977d8c2d94644d4027b11f45.tar.gz nixlib-186a8400ed80f08d977d8c2d94644d4027b11f45.tar.bz2 nixlib-186a8400ed80f08d977d8c2d94644d4027b11f45.tar.lz nixlib-186a8400ed80f08d977d8c2d94644d4027b11f45.tar.xz nixlib-186a8400ed80f08d977d8c2d94644d4027b11f45.tar.zst nixlib-186a8400ed80f08d977d8c2d94644d4027b11f45.zip | |
nginx module: make httpConfig backward compatible
Diffstat (limited to 'nixos/modules/services/web-servers')
| -rw-r--r-- | nixos/modules/services/web-servers/nginx/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
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} ''; |