Merge pull request #222080 from Stunkymonkey/nixos-optionalString

2023-04-20 16:07:30 +03:00
parent 2fc54db033 327b0cff7a
commit b83db86a9e
41 changed files with 89 additions and 95 deletions
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -318,7 +318,7 @@ let

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

            listen ${addr}:${toString port} "