ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

nixos/nginx: using new variant of http2 directive

Browse Source
This commit is contained in:
Izorkin 2023-07-28 18:13:37 +03:00
parent f1f450ab72
commit cf7cea3287
No known key found for this signature in database
GPG Key ID: 1436C1B3F3679F09
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -335,7 +335,7 @@ let
+ ";")) + ";"))
+ " + "
listen ${addr}:${toString port} " listen ${addr}:${toString port} "
+ optionalString (ssl && vhost.http2) "http2 " + optionalString (ssl && vhost.http2 && oldHTTP2) "http2 "
+ optionalString ssl "ssl " + optionalString ssl "ssl "
+ optionalString vhost.default "default_server " + optionalString vhost.default "default_server "
+ optionalString vhost.reuseport "reuseport " + optionalString vhost.reuseport "reuseport "
@ -380,6 +380,9 @@ let
server { server {
${concatMapStringsSep "\n" listenString hostListen} ${concatMapStringsSep "\n" listenString hostListen}
server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases}; server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases};
${optionalString (hasSSL && vhost.http2 && !oldHTTP2) ''
http2 on;
''}
${optionalString (hasSSL && vhost.quic) '' ${optionalString (hasSSL && vhost.quic) ''
http3 ${if vhost.http3 then "on" else "off"}; http3 ${if vhost.http3 then "on" else "off"};
http3_hq ${if vhost.http3_hq then "on" else "off"}; http3_hq ${if vhost.http3_hq then "on" else "off"};
@ -463,6 +466,8 @@ let
); );
mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix; mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix;
oldHTTP2 = versionOlder cfg.package.version "1.25.1";
in in
{ {