aboutsummaryrefslogtreecommitdiff
path: root/manifests/rules/torify/user.pp
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2013-01-02 18:02:31 +0100
committerintrigeri <intrigeri@boum.org>2013-01-02 18:02:31 +0100
commit5e555243c8dd93f7e5cfadacc9c3843d5f9d421c (patch)
treeae9523884d7447e57a9a1ac91f60a39da24c8e04 /manifests/rules/torify/user.pp
parent88fa544a9c2f974b35a169b4e3865ccaf4f68fd1 (diff)
downloadpuppet-shorewall-5e555243c8dd93f7e5cfadacc9c3843d5f9d421c.tar.gz
puppet-shorewall-5e555243c8dd93f7e5cfadacc9c3843d5f9d421c.tar.bz2
Revert "Support exempting some users from torification measures."
This reverts commit 6bc54f031b9ae12fe428c83e70733c8b2ff4c67a. This stuff is not ready for the shared repo, but we want to take benefit from me having already merged immerda's stuff into my branch and solved the conflicts.
Diffstat (limited to 'manifests/rules/torify/user.pp')
-rw-r--r--manifests/rules/torify/user.pp4
1 files changed, 4 insertions, 0 deletions
diff --git a/manifests/rules/torify/user.pp b/manifests/rules/torify/user.pp
index 49c0b34..5caccfd 100644
--- a/manifests/rules/torify/user.pp
+++ b/manifests/rules/torify/user.pp
@@ -7,6 +7,10 @@ define shorewall::rules::torify::user(
include shorewall::rules::torify::allow_tor_transparent_proxy
+ if $originaldest == '-' and $user == '-' {
+ include shorewall::rules::torify::allow_tor_user
+ }
+
shorewall::rules::torify::redirect_tcp_to_tor {
"redirect-to-tor-user=${user}-to=${originaldest}":
user => $user,