diff options
| author | Julien Moutinho <julm+nixpkgs@sourcephile.fr> | 2021-01-12 10:14:14 +0100 |
|---|---|---|
| committer | Julien Moutinho <julm+nixpkgs@sourcephile.fr> | 2021-01-12 10:14:14 +0100 |
| commit | 7a62c0bc957116b7fa61d469cf008038d34d5e2e (patch) | |
| tree | 4036dc2c45dc81f03e225a4098ab319c7c9977e0 /nixos/modules/services/security/tor.nix | |
| parent | 5cbe85dbd8e2c648753e4b3e65d74e3a7506431c (diff) | |
| download | nixpkgs-7a62c0bc957116b7fa61d469cf008038d34d5e2e.tar nixpkgs-7a62c0bc957116b7fa61d469cf008038d34d5e2e.tar.gz nixpkgs-7a62c0bc957116b7fa61d469cf008038d34d5e2e.tar.bz2 nixpkgs-7a62c0bc957116b7fa61d469cf008038d34d5e2e.tar.lz nixpkgs-7a62c0bc957116b7fa61d469cf008038d34d5e2e.tar.xz nixpkgs-7a62c0bc957116b7fa61d469cf008038d34d5e2e.tar.zst nixpkgs-7a62c0bc957116b7fa61d469cf008038d34d5e2e.zip | |
nixos/tor: fix openFirewall when ORPort isInt
Diffstat (limited to 'nixos/modules/services/security/tor.nix')
| -rw-r--r-- | nixos/modules/services/security/tor.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 390dcfccfec..54c2c2dea23 100644 --- 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 ]); |