aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2012-11-11 23:12:47 +0100
committerintrigeri <intrigeri@boum.org>2012-11-11 23:12:47 +0100
commit286be43f235dc0418bac2c85d49e824f22479985 (patch)
tree65406bb23ba26dc1b4c25570360c317f986a745e /manifests
parente31f901dc4a40b87611871d0cd783bbcec1ba4ed (diff)
parent0c28fa636653f395c756f56c93f8c78fddfcee00 (diff)
downloadpuppet-shorewall-286be43f235dc0418bac2c85d49e824f22479985.tar.gz
puppet-shorewall-286be43f235dc0418bac2c85d49e824f22479985.tar.bz2
Merge branch 'feature/torify-dns' into old-master
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp6
-rw-r--r--manifests/rules/torify/redirect_dns_to_tor.pp38
2 files changed, 44 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index dd28767..a446253 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -27,6 +27,12 @@ class shorewall(
case $tor_transparent_proxy_port {
'': { $tor_transparent_proxy_port = '9040' }
}
+ case $tor_dns_host {
+ '': { $tor_dns_host = '127.0.0.1' }
+ }
+ case $tor_dns_port {
+ '': { $tor_dns_port = '8853' }
+ }
if $tor_user == '' {
$tor_user = $dist_tor_user ? {
'' => 'tor',
diff --git a/manifests/rules/torify/redirect_dns_to_tor.pp b/manifests/rules/torify/redirect_dns_to_tor.pp
new file mode 100644
index 0000000..9c71204
--- /dev/null
+++ b/manifests/rules/torify/redirect_dns_to_tor.pp
@@ -0,0 +1,38 @@
+define shorewall::rules::torify::redirect_dns_to_tor() {
+
+ $user = $name
+
+ $destzone = $shorewall::tor_dns_host ? {
+ '127.0.0.1' => '$FW',
+ default => 'net'
+ }
+
+ $tcp_rule = "redirect-tcp-dns-to-tor-user=${user}"
+ if !defined(Shorewall::Rule["$tcp_rule"]) {
+ shorewall::rule {
+ "$tcp_rule":
+ source => '$FW',
+ destination => "${destzone}:${shorewall::tor_dns_host}:${shorewall::tor_dns_port}",
+ proto => 'tcp',
+ destinationport => 'domain',
+ user => $user,
+ order => 108,
+ action => 'DNAT';
+ }
+ }
+
+ $udp_rule = "redirect-udp-dns-to-tor-user=${user}"
+ if !defined(Shorewall::Rule["$udp_rule"]) {
+ shorewall::rule {
+ "$udp_rule":
+ source => '$FW',
+ destination => "${destzone}:${shorewall::tor_dns_host}:${shorewall::tor_dns_port}",
+ proto => 'udp',
+ destinationport => 'domain',
+ user => $user,
+ order => 108,
+ action => 'DNAT';
+ }
+ }
+
+}