nixos/tor: fix openFirewall when ORPort isInt

2021-01-12 10:14:14 +01:00 · 2021-01-12 10:14:14 +01:00 · 7a62c0bc95
commit 7a62c0bc95
parent 5cbe85dbd8
1 changed files with 5 additions and 2 deletions
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@ -909,8 +909,11 @@ in

    networking.firewall = mkIf cfg.openFirewall {
      allowedTCPPorts =
-        concatMap (o: optional (isInt o && o > 0 || o ? "port" && isInt o.port && o.port > 0) o.port)
-        (flatten [
+        concatMap (o:
+          if isInt o && o > 0 then [o]
+          else if o ? "port" && isInt o.port && o.port > 0 then [o.port]
+          else []
+        ) (flatten [
          cfg.settings.ORPort
          cfg.settings.DirPort
        ]);