summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2017-05-01 17:37:05 +0200
committermh <mh@immerda.ch>2017-05-01 17:37:05 +0200
commitdb26643a43b74f5718f81a821316d6a58855b371 (patch)
tree56652eb41f5579a482df2d6d04d2412aa107037a
parent80aa7d6546d122ccba0b2acc8befa3f20bd08ffd (diff)
also support EL6 style files
-rw-r--r--files/boilerplate6/interfaces.header.CentOS.612
-rw-r--r--manifests/managed_file.pp3
2 files changed, 14 insertions, 1 deletions
diff --git a/files/boilerplate6/interfaces.header.CentOS.6 b/files/boilerplate6/interfaces.header.CentOS.6
new file mode 100644
index 0000000..944bd94
--- /dev/null
+++ b/files/boilerplate6/interfaces.header.CentOS.6
@@ -0,0 +1,12 @@
+#
+# Shorewall6 version 4 - Interfaces File
+#
+# For information about entries in this file, type "man shorewall6-interfaces"
+#
+# The manpage is also online at
+# http://www.shorewall.net/manpages6/shorewall6-interfaces.html
+#
+###############################################################################
+FORMAT 2
+###############################################################################
+#ZONE INTERFACE OPTIONS
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';
}