diff options
| author | intrigeri <intrigeri@boum.org> | 2012-11-11 23:12:41 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2012-11-11 23:12:41 +0100 |
| commit | e31f901dc4a40b87611871d0cd783bbcec1ba4ed (patch) | |
| tree | 489f62edc01ded9a88e39cdc9c84d5f7c7351e1c /manifests/rules/torify/redirect_tcp_to_tor.pp | |
| parent | 6c29c55b9cc35a3ba06704e34dd3483a33c85898 (diff) | |
| parent | 6bc54f031b9ae12fe428c83e70733c8b2ff4c67a (diff) | |
| download | puppet-shorewall-e31f901dc4a40b87611871d0cd783bbcec1ba4ed.tar.gz puppet-shorewall-e31f901dc4a40b87611871d0cd783bbcec1ba4ed.tar.bz2 | |
Merge branch 'feature/torification-exception' into old-master
Diffstat (limited to 'manifests/rules/torify/redirect_tcp_to_tor.pp')
| -rw-r--r-- | manifests/rules/torify/redirect_tcp_to_tor.pp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/manifests/rules/torify/redirect_tcp_to_tor.pp b/manifests/rules/torify/redirect_tcp_to_tor.pp index 2bee658..fe1c5fe 100644 --- a/manifests/rules/torify/redirect_tcp_to_tor.pp +++ b/manifests/rules/torify/redirect_tcp_to_tor.pp @@ -14,11 +14,6 @@ define shorewall::rules::torify::redirect_tcp_to_tor( default => $originaldest, } - $user_real = $user ? { - '-' => "!${shorewall::tor_user}", - default => $user, - } - $destzone = $shorewall::tor_transparent_proxy_host ? { '127.0.0.1' => '$FW', default => 'net' @@ -30,7 +25,7 @@ define shorewall::rules::torify::redirect_tcp_to_tor( destination => "${destzone}:${shorewall::tor_transparent_proxy_host}:${shorewall::tor_transparent_proxy_port}", proto => 'tcp:syn', originaldest => $originaldest_real, - user => $user_real, + user => $user, order => 110, action => 'DNAT'; } |