From 983ae4c5bc61b09422b671123e670d62cb4e2e59 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Tue, 29 Aug 2017 22:14:33 +0200
Subject: correctly set shorewall6 option for puppetserver config

---
 manifests/rules/out/puppet.pp |  1 +
 manifests/rules/puppet.pp     | 24 +++++++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/manifests/rules/out/puppet.pp b/manifests/rules/out/puppet.pp
index 827e23a..2444dcb 100644
--- a/manifests/rules/out/puppet.pp
+++ b/manifests/rules/out/puppet.pp
@@ -9,6 +9,7 @@ class shorewall::rules::out::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':
diff --git a/manifests/rules/puppet.pp b/manifests/rules/puppet.pp
index 6cb0282..dcb88f5 100644
--- a/manifests/rules/puppet.pp
+++ b/manifests/rules/puppet.pp
@@ -3,28 +3,38 @@ class shorewall::rules::puppet(
   $puppetserver          = "puppet.${::domain}",
   $puppetserver_v6       = undef,
   $puppetserver_port     = 8140,
-  $puppetserver_signport = 8141
+  $puppetserver_signport = 8141,
+  $shorewall6            = true,
 ){
   shorewall::params{
-    'PUPPETSERVER_PORT':        value => $puppetserver_port;
-    'PUPPETSERVER_SIGN_PORT':   value => $puppetserver_signport;
+    'PUPPETSERVER_PORT':
+      value      => $puppetserver_port,
+      shorewall6 => $shorewall6;
+    'PUPPETSERVER_SIGN_PORT':
+      value      => $puppetserver_signport,
+      shorewall6 => $shorewall6,
   }
   if is_ipv4_address($puppetserver){
     shorewall::params4{
-      'PUPPETSERVER': value => $puppetserver;
+      'PUPPETSERVER':
+        value => $puppetserver;
     }
     if $puppetserver_v6 {
       shorewall::params6{
-        'PUPPETSERVER': value => $puppetserver;
+        'PUPPETSERVER':
+          value => $puppetserver_v6;
       }
     }
   } elsif is_ipv6_address($puppetserver){
     shorewall::params6{
-      'PUPPETSERVER': value => $puppetserver;
+      'PUPPETSERVER':
+        value => $puppetserver;
     }
   } else {
     shorewall::params{
-      'PUPPETSERVER': value => $puppetserver;
+      'PUPPETSERVER':
+        value      => $puppetserver,
+        shorewall6 => $shorewall6;
     }
   }
 }
-- 
cgit v1.2.3