diff options
author | Micah Anderson <micah@riseup.net> | 2013-02-12 11:14:32 -0500 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-02-12 11:14:32 -0500 |
commit | 05b4a4d9d6ddb594ffa900192ad0ad714957663f (patch) | |
tree | 2a24f3b6ecf55e8f8265cf7b9aa0e86c5563638b /puppet/modules/site_shorewall/manifests/tor.pp | |
parent | 1a2789d084c3c2beccb97726b8799cb194a634fd (diff) | |
parent | 102af94df02decef888bac09748dbac6773dedd6 (diff) |
Merge remote-tracking branch 'origin/develop' into bundle-and-precompile-as-user
Diffstat (limited to 'puppet/modules/site_shorewall/manifests/tor.pp')
-rw-r--r-- | puppet/modules/site_shorewall/manifests/tor.pp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/puppet/modules/site_shorewall/manifests/tor.pp b/puppet/modules/site_shorewall/manifests/tor.pp index a72d9dfc..8fe21ee6 100644 --- a/puppet/modules/site_shorewall/manifests/tor.pp +++ b/puppet/modules/site_shorewall/manifests/tor.pp @@ -18,11 +18,7 @@ class site_shorewall::tor { destination => '$FW', action => 'leap_tor(ACCEPT)', order => 200; - 'net2fw-http': - source => 'net', - destination => '$FW', - action => 'HTTP(ACCEPT)', - order => 200; } + include site_shorewall::service::http } |