diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-12-20 11:18:33 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-20 11:18:33 +0000 |
commit | cf12bc44b64f22a82a2c30d2730b2cbc387e8397 (patch) | |
tree | 1fbd733c9031f82b9066714bc14557950f6da8c5 /nixos | |
parent | 9c5fedc23ec61e8d63dc99bbde59852f3c1d5c08 (diff) | |
parent | afa97cb981c5de4cb68631b911e1de32aa83dcf7 (diff) |
Merge pull request #32858 from nh2/nginx-add-http2-option
nginx service: Make http2 an option.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/web-servers/nginx/default.nix | 3 | ||||
-rw-r--r-- | nixos/modules/services/web-servers/nginx/vhost-options.nix | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 97511aac97374..b4a075ce0ae07 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -167,7 +167,8 @@ let listenString = { addr, port, ssl, ... }: "listen ${addr}:${toString port} " - + optionalString ssl "ssl http2 " + + optionalString ssl "ssl " + + optionalString vhost.http2 "http2 " + optionalString vhost.default "default_server " + ";"; diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 801601aafd9d6..29f08cc4f307e 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -114,6 +114,20 @@ with lib; description = "Path to server SSL certificate key."; }; + http2 = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable HTTP 2. + Note that (as of writing) due to nginx's implementation, to disable + HTTP 2 you have to disable it on all vhosts that use a given + IP address / port. + If there is one server block configured to enable http2,then it is + enabled for all server blocks on this IP. + See https://stackoverflow.com/a/39466948/263061. + ''; + }; + root = mkOption { type = types.nullOr types.path; default = null; |