diff options
| -rw-r--r-- | manifests/router/tor.pp | 24 | ||||
| -rw-r--r-- | manifests/virtual/tor.pp | 16 |
2 files changed, 20 insertions, 20 deletions
diff --git a/manifests/router/tor.pp b/manifests/router/tor.pp index 6a2986f..710b4a0 100644 --- a/manifests/router/tor.pp +++ b/manifests/router/tor.pp @@ -2,42 +2,42 @@ define firewall::router::tor($destination, $zone = 'loc', $originaldest = $ipadd shorewall::rule { "tor-$name-1": action => 'DNAT', source => 'net', - destination => "$zone:$destination:9001", + destination => "$zone:$destination:9000", proto => 'tcp', - destinationport => "9001", + destinationport => "9000", ratelimit => '-', - order => "29001", + order => "29000", } shorewall::rule { "tor-$name-2": action => 'DNAT', source => '$FW', - destination => "$zone:$destination:9001", + destination => "$zone:$destination:9000", proto => 'tcp', - destinationport => "9001", + destinationport => "9000", originaldest => "$originaldest", ratelimit => '-', - order => "29001", + order => "29000", } shorewall::rule { "tor-$name-3": action => 'DNAT', source => 'net', - destination => "$zone:$destination:9030", + destination => "$zone:$destination:9001", proto => 'tcp', - destinationport => "9030", + destinationport => "9001", ratelimit => '-', - order => "29030", + order => "29001", } shorewall::rule { "tor-$name-4": action => 'DNAT', source => '$FW', - destination => "$zone:$destination:9030", + destination => "$zone:$destination:9001", proto => 'tcp', - destinationport => "9030", + destinationport => "9001", originaldest => "$originaldest", ratelimit => '-', - order => "29030", + order => "29001", } } diff --git a/manifests/virtual/tor.pp b/manifests/virtual/tor.pp index 4d336c6..8424f3b 100644 --- a/manifests/virtual/tor.pp +++ b/manifests/virtual/tor.pp @@ -2,9 +2,9 @@ class firewall::virtual::tor($destination, $zone = 'fw') { shorewall::rule { 'tor-0': action => 'DNAT', source => 'net', - destination => "$zone:$destination:9001", + destination => "$zone:$destination:9000", proto => 'tcp', - destinationport => '9001', + destinationport => '9000', ratelimit => '-', order => 2100, } @@ -12,9 +12,9 @@ class firewall::virtual::tor($destination, $zone = 'fw') { shorewall::rule { 'tor-1': action => 'DNAT', source => '$FW', - destination => "$zone:$destination:9001", + destination => "$zone:$destination:9000", proto => 'tcp', - destinationport => '9001', + destinationport => '9000', originaldest => hiera('firewall::external_ip', $::ipaddress), ratelimit => '-', order => 2101, @@ -23,9 +23,9 @@ class firewall::virtual::tor($destination, $zone = 'fw') { shorewall::rule { 'tor-2': action => 'DNAT', source => 'net', - destination => "$zone:$destination:9030", + destination => "$zone:$destination:9001", proto => 'tcp', - destinationport => '9030', + destinationport => '9001', ratelimit => '-', order => 2102, } @@ -33,9 +33,9 @@ class firewall::virtual::tor($destination, $zone = 'fw') { shorewall::rule { 'tor-3': action => 'DNAT', source => '$FW', - destination => "$zone:$destination:9030", + destination => "$zone:$destination:9001", proto => 'tcp', - destinationport => '9030', + destinationport => '9001', originaldest => hiera('firewall::external_ip', $::ipaddress), ratelimit => '-', order => 2103, |