diff options
author | Vincent Bernat <vincent@bernat.ch> | 2020-03-28 20:29:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-28 20:29:09 +0100 |
commit | 8f8cbec9855a7088ba40929689637ccec493d372 (patch) | |
tree | c2a0726192c32eef904607f0ebed607672034eea /nixos | |
parent | 77a062fe47940f1d1cdfb136934bb42d20094c51 (diff) |
nixos/nginx: use mailcap mimetypes in all cases (#83611)
In ff0148d868bd, nginx configuration was modified to use mime.types from mailcap package as it is more complete. However, there are two places where mime.types is included in configuration. When the user was setting `cfg.httpConfig`, the mime.types from nginx was still used. This commit fix that by moving the common snippet in a variable of its own and ensure it is used at both places.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/web-servers/nginx/default.nix | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 28b433104a1c9..2df39390eb448 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -46,6 +46,15 @@ let } '')); + commonHttpConfig = '' + # The mime type definitions included with nginx are very incomplete, so + # we use a list of mime types from the mailcap package, which is also + # used by most other Linux distributions by default. + include ${pkgs.mailcap}/etc/nginx/mime.types; + include ${cfg.package}/conf/fastcgi.conf; + include ${cfg.package}/conf/uwsgi_params; + ''; + configFile = pkgs.writers.writeNginxConfig "nginx.conf" '' pid /run/nginx/nginx.pid; error_log ${cfg.logError}; @@ -61,12 +70,7 @@ let ${optionalString (cfg.httpConfig == "" && cfg.config == "") '' http { - # The mime type definitions included with nginx are very incomplete, so - # we use a list of mime types from the mailcap package, which is also - # used by most other Linux distributions by default. - include ${pkgs.mailcap}/etc/nginx/mime.types; - include ${cfg.package}/conf/fastcgi.conf; - include ${cfg.package}/conf/uwsgi_params; + ${commonHttpConfig} ${optionalString (cfg.resolver.addresses != []) '' resolver ${toString cfg.resolver.addresses} ${optionalString (cfg.resolver.valid != "") "valid=${cfg.resolver.valid}"} ${optionalString (!cfg.resolver.ipv6) "ipv6=off"}; @@ -172,9 +176,7 @@ let ${optionalString (cfg.httpConfig != "") '' http { - include ${cfg.package}/conf/mime.types; - include ${cfg.package}/conf/fastcgi.conf; - include ${cfg.package}/conf/uwsgi_params; + ${common.httpConfig} ${cfg.httpConfig} }''} |