introduce params4 and params6 helper to more easily differentiate

3 files changed, 34 insertions, 2 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 6a7eafc..826f446 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -144,8 +144,8 @@ class shorewall(
   create_resources('shorewall::routestopped',$routestopped,
     $routestopped_defaults)
   create_resources('shorewall::params',$params,$params_defaults)
-  create_resources('shorewall::params',$params4,merge({shorewall6 => false,},$params_defaults))
-  create_resources('shorewall::params',$params6,merge({shorewall => false,},$params_defaults))
+  create_resources('shorewall::params4',$params4,$params_defaults)
+  create_resources('shorewall::params6',$params6,$params_defaults)
   create_resources('shorewall::tcdevices',$tcdevices,$tcdevices_defaults)
   create_resources('shorewall::tcrules',$tcrules,$tcrules_defaults)
   create_resources('shorewall::tcclasses',$tcclasses,$tcclasses_defaults)
diff --git a/manifests/params4.pp b/manifests/params4.pp
new file mode 100644
index 0000000..fc50fa3
--- /dev/null
+++ b/manifests/params4.pp
@@ -0,0 +1,16 @@
+# manage a shorewall param, only for ipv4
+# http://www.shorewall.net/manpages/shorewall-params.html
+define shorewall::params4(
+  $value,
+  $key   = $name,
+  $order ='100',
+){
+  shorewall::params{
+    $name:
+      key        => $key,
+      value      => $value,
+      order      => $order,
+      shorewall  => true,
+      shorewall6 => false,
+  }
+}
diff --git a/manifests/params6.pp b/manifests/params6.pp
new file mode 100644
index 0000000..58c1f86
--- /dev/null
+++ b/manifests/params6.pp
@@ -0,0 +1,16 @@
+# manage a shorewall param, only for ipv6
+# http://www.shorewall.net/manpages6/shorewall6-params.html
+define shorewall::params6(
+  $value,
+  $key   = $name,
+  $order ='100',
+){
+  shorewall::params{
+    $name:
+      key        => $key,
+      value      => $value,
+      order      => $order,
+      shorewall  => false,
+      shorewall6 => true,
+  }
+}