Merge remote-tracking branch 'shared/master'HEADmaster

1 files changed, 31 insertions, 6 deletions

diff --git a/manifests/rules/puppet.pp b/manifests/rules/puppet.pp
index 84e7d81..3c90370 100644
--- a/manifests/rules/puppet.pp
+++ b/manifests/rules/puppet.pp
@@ -1,11 +1,36 @@
+# outgoing puppet params
 class shorewall::rules::puppet(
-  $puppetserver = "puppet.${::domain}",
-  $puppetserver_port = 8140,
-  $puppetserver_signport = 8141
+  $puppetserver          = "puppet.${::domain}",
+  $puppetserver_v6       = undef,
+  $puppetserver_port     = 8140,
+  $shorewall6            = true,
 ){
   shorewall::params{
-    'PUPPETSERVER':             value => $puppetserver;
-    'PUPPETSERVER_PORT':        value => $puppetserver_port;
-    'PUPPETSERVER_SIGN_PORT':   value => $puppetserver_signport;
+    'PUPPETSERVER_PORT':
+      value      => $puppetserver_port,
+      shorewall6 => $shorewall6;
+  }
+  if is_ipv4_address($puppetserver){
+    shorewall::params4{
+      'PUPPETSERVER':
+        value => $puppetserver;
+    }
+    if $puppetserver_v6 {
+      shorewall::params6{
+        'PUPPETSERVER':
+          value => $puppetserver_v6;
+      }
+    }
+  } elsif is_ipv6_address($puppetserver){
+    shorewall::params6{
+      'PUPPETSERVER':
+        value => $puppetserver;
+    }
+  } else {
+    shorewall::params{
+      'PUPPETSERVER':
+        value      => $puppetserver,
+        shorewall6 => $shorewall6;
+    }
   }
 }