dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos/nginx: Fix listen string generation

Browse Source 
This regressed in 327b0cff7a breaking nixosTests.php, among other things.
This commit is contained in:
Jan Tojnar 2023-04-21 17:18:45 +02:00
parent 30e9d5c816
commit e25dc4a95e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,7 +318,7 @@ let
listenString = { addr, port, ssl, extraParameters ? [], ... }: listenString = { addr, port, ssl, extraParameters ? [], ... }:
# UDP listener for QUIC transport protocol. # UDP listener for QUIC transport protocol.
(optionalString (ssl && vhost.quic) " (optionalString (ssl && vhost.quic) ("
listen ${addr}:${toString port} quic " listen ${addr}:${toString port} quic "
+ optionalString vhost.default "default_server " + optionalString vhost.default "default_server "
+ optionalString vhost.reuseport "reuseport " + optionalString vhost.reuseport "reuseport "
@ -326,7 +326,7 @@ let
let inCompatibleParameters = [ "ssl" "proxy_protocol" "http2" ]; let inCompatibleParameters = [ "ssl" "proxy_protocol" "http2" ];
isCompatibleParameter = param: !(any (p: p == param) inCompatibleParameters); isCompatibleParameter = param: !(any (p: p == param) inCompatibleParameters);
in filter isCompatibleParameter extraParameters)) in filter isCompatibleParameter extraParameters))
+ ";") + ";"))
+ " + "
listen ${addr}:${toString port} " listen ${addr}:${toString port} "