mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 12:38:41 +03:00
Merge pull request #109096 from ju1m/tor
nixos/tor: fix openFirewall when ORPort isInt
This commit is contained in:
commit
9c4a18591f
@ -909,8 +909,11 @@ in
|
|||||||
|
|
||||||
networking.firewall = mkIf cfg.openFirewall {
|
networking.firewall = mkIf cfg.openFirewall {
|
||||||
allowedTCPPorts =
|
allowedTCPPorts =
|
||||||
concatMap (o: optional (isInt o && o > 0 || o ? "port" && isInt o.port && o.port > 0) o.port)
|
concatMap (o:
|
||||||
(flatten [
|
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.ORPort
|
||||||
cfg.settings.DirPort
|
cfg.settings.DirPort
|
||||||
]);
|
]);
|
||||||
|
Loading…
Reference in New Issue
Block a user