6 files changed, 58 insertions, 33 deletions
diff --git a/manifests/rules/out/ekeyd.pp b/manifests/rules/out/ekeyd.pp
index 8acdaad..c437f6a 100644
--- a/manifests/rules/out/ekeyd.pp
+++ b/manifests/rules/out/ekeyd.pp
@@ -1,5 +1,5 @@
 define shorewall::rules::out::ekeyd($host) {
-  shorewall::rule { "me-${name}-tcp_ekeyd":
+  shorewall::rule4{ "me-${name}-tcp_ekeyd":
     source          => '$FW',
     destination     => "${name}:${host}",
     proto           => 'tcp',
diff --git a/manifests/rules/out/ibackup.pp b/manifests/rules/out/ibackup.pp
index 856bcdb..17cc314 100644
--- a/manifests/rules/out/ibackup.pp
+++ b/manifests/rules/out/ibackup.pp
@@ -1,5 +1,7 @@
 class shorewall::rules::out::ibackup(
-  $backup_host
+  $backup_host,
+  $shorewall  = true,
+  $shorewall6 = false,
 ){
   shorewall::rule { 'me-net-tcp_backupssh':
     source          => '$FW',
@@ -7,6 +9,8 @@ class shorewall::rules::out::ibackup(
     proto           => 'tcp',
     destinationport => 'ssh',
     order           => 240,
-    action          => 'ACCEPT';
+    action          => 'ACCEPT',
+    shorewall       => $shorewall,
+    shorewall6      => $shorewall6,
   }
 }
diff --git a/manifests/rules/out/imap.pp b/manifests/rules/out/imap.pp
index f1313d2..0cbee50 100644
--- a/manifests/rules/out/imap.pp
+++ b/manifests/rules/out/imap.pp
@@ -1,11 +1,15 @@
-class shorewall::rules::out::imap {
-    shorewall::rule {
-        'me-net-tcp_imap_s':
-            source          =>      '$FW',
-            destination     =>      'net',
-            proto           =>      'tcp',
-            destinationport =>      '143,993',
-            order           =>      260,
-            action          =>      'ACCEPT';
-    }
+# outgoing imap
+class shorewall::rules::out::imap(
+  $shorewall6 = true,
+) {
+  shorewall::rule {
+    'me-net-tcp_imap_s':
+      source          => '$FW',
+      destination     => 'net',
+      proto           => 'tcp',
+      destinationport => '143,993',
+      order           => 260,
+      action          => 'ACCEPT',
+      shorewall6      => $shorewall6,
+  }
 }
diff --git a/manifests/rules/out/pop3.pp b/manifests/rules/out/pop3.pp
index ebd4828..ea66bf7 100644
--- a/manifests/rules/out/pop3.pp
+++ b/manifests/rules/out/pop3.pp
@@ -1,11 +1,15 @@
-class shorewall::rules::out::pop3 {
-    shorewall::rule {
-        'me-net-tcp_pop3_s':
-            source          =>      '$FW',
-            destination     =>      'net',
-            proto           =>      'tcp',
-            destinationport =>      'pop3,pop3s',
-            order           =>      260,
-            action          =>      'ACCEPT';
-    }
+# outoging oper3
+class shorewall::rules::out::pop3(
+  $shorewall6 = true,
+) {
+  shorewall::rule {
+    'me-net-tcp_pop3_s':
+      source          => '$FW',
+      destination     => 'net',
+      proto           => 'tcp',
+      destinationport => 'pop3,pop3s',
+      order           => 260,
+      action          => 'ACCEPT',
+      shorewall6      => $shorewall6,
+  }
 }
diff --git a/manifests/rules/out/puppet.pp b/manifests/rules/out/puppet.pp
index cbe8cce..ac13bbb 100644
--- a/manifests/rules/out/puppet.pp
+++ b/manifests/rules/out/puppet.pp
@@ -1,20 +1,22 @@
+# outgoing puppet traffic
 class shorewall::rules::out::puppet(
-  $puppetserver = "puppet.${::domain}",
-  $puppetserver_port = 8140,
-  $puppetserver_signport = 8141
+  $puppetserver          = "puppet.${::domain}",
+  $puppetserver_port     = 8140,
+  $shorewall6            = true,
 ) {
   class{'shorewall::rules::puppet':
     puppetserver          => $puppetserver,
     puppetserver_port     => $puppetserver_port,
-    puppetserver_signport => $puppetserver_signport,
+    shorewall6            => $shorewall6,
   }
   # we want to connect to the puppet server
   shorewall::rule { 'me-net-puppet_tcp':
-    source          =>      '$FW',
-    destination     =>      'net:$PUPPETSERVER',
-    proto           =>      'tcp',
-    destinationport =>      '$PUPPETSERVER_PORT,$PUPPETSERVER_SIGN_PORT',
-    order           =>      340,
-    action          =>      'ACCEPT';
+    source          => '$FW',
+    destination     => 'net:$PUPPETSERVER',
+    proto           => 'tcp',
+    destinationport => '$PUPPETSERVER_PORT',
+    order           => 340,
+    shorewall6      => $shorewall6,
+    action          => 'ACCEPT';
   }
 }
diff --git a/manifests/rules/out/tor.pp b/manifests/rules/out/tor.pp
new file mode 100644
index 0000000..b4128d0
--- /dev/null
+++ b/manifests/rules/out/tor.pp
@@ -0,0 +1,11 @@
+# open outgoing port to connect to the network
+class shorewall::rules::out::tor {
+  shorewall::rule{'me-net-tor-tcp':
+    source          => '$FW',
+    destination     => 'net',
+    proto           => 'tcp',
+    destinationport => '9001',
+    order           => 240,
+    action          => 'ACCEPT';
+  }
+}