From d11b179b1b2f6083c0987e4650d89ad7831863e6 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 7 Apr 2017 18:07:44 +0200
Subject: add mgmt of files for shorewall6

---
 manifests/managed_file.pp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'manifests/managed_file.pp')

diff --git a/manifests/managed_file.pp b/manifests/managed_file.pp
index b353814..b4941a7 100644
--- a/manifests/managed_file.pp
+++ b/manifests/managed_file.pp
@@ -1,8 +1,9 @@
 # manage a certain file
-define shorewall::managed_file() {
+define shorewall::managed_file(
+  $shorewall6 = false,
+) {
   concat{ "/etc/shorewall/puppet/${name}":
     notify  => Exec['shorewall_check'],
-    require => File['/etc/shorewall/puppet'],
     owner   => 'root',
     group   => 'root',
     mode    => '0600';
@@ -17,4 +18,18 @@ define shorewall::managed_file() {
       target => "/etc/shorewall/puppet/${name}",
       order  => '999';
   }
+  if $shorewall6 and $shorewall::with_shorewall6 {
+    concat{ "/etc/shorewall6/puppet/${name}":
+      notify  => Exec['shorewall6_check'],
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0600';
+    }
+    concat::fragment {
+      "${name}-header":
+        source => "puppet:///modules/shorewall/boilerplate6/${name}.header",
+        target => "/etc/shorewall6/puppet/${name}",
+        order  => '000';
+    }
+  }
 }
-- 
cgit v1.2.3


From 2c255e1fca1a5cabdc9e8dfab80e69dd4cd882ac Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 7 Apr 2017 18:09:37 +0200
Subject: rename snippet

---
 manifests/managed_file.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/managed_file.pp')

diff --git a/manifests/managed_file.pp b/manifests/managed_file.pp
index b4941a7..135d59a 100644
--- a/manifests/managed_file.pp
+++ b/manifests/managed_file.pp
@@ -26,7 +26,7 @@ define shorewall::managed_file(
       mode    => '0600';
     }
     concat::fragment {
-      "${name}-header":
+      "6${name}-header":
         source => "puppet:///modules/shorewall/boilerplate6/${name}.header",
         target => "/etc/shorewall6/puppet/${name}",
         order  => '000';
-- 
cgit v1.2.3


From db26643a43b74f5718f81a821316d6a58855b371 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Mon, 1 May 2017 17:37:05 +0200
Subject: also support EL6 style files

---
 manifests/managed_file.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'manifests/managed_file.pp')

diff --git a/manifests/managed_file.pp b/manifests/managed_file.pp
index 135d59a..4251a8f 100644
--- a/manifests/managed_file.pp
+++ b/manifests/managed_file.pp
@@ -27,7 +27,8 @@ define shorewall::managed_file(
     }
     concat::fragment {
       "6${name}-header":
-        source => "puppet:///modules/shorewall/boilerplate6/${name}.header",
+        source => [ "puppet:///modules/shorewall/boilerplate6/${name}.header.${operatingsystem}.${operatingsystemmajrelease}",
+                    "puppet:///modules/shorewall/boilerplate6/${name}.header",],
         target => "/etc/shorewall6/puppet/${name}",
         order  => '000';
     }
-- 
cgit v1.2.3