Feat: major refactor

1 files changed, 16 insertions, 27 deletions

diff --git a/manifests/router/munin.pp b/manifests/router/munin.pp
index 7ca136d..4fd33fd 100644
--- a/manifests/router/munin.pp
+++ b/manifests/router/munin.pp
@@ -1,29 +1,18 @@
-define firewall::router::munin($destination, $port_orig, $port_dest = '', $zone = 'loc',
-                               $order = '400', $originaldest = $ipaddress) {
-  shorewall::rule { "munin-$name-1":
-    action          => 'DNAT',
-    source          => 'net',
-    destination     => $port_dest ? {
-      ''      => "$zone:$destination",
-      default => "$zone:$destination:$port_dest",
-    },
-    proto           => 'tcp',
-    destinationport => "$port_orig",
-    ratelimit       => '-',
-    order           => $order,
-  }
-
-  shorewall::rule { "munin-$name-2":
-    action          => 'DNAT',
-    source          => '$FW',
-    destination     => $port_dest ? {
-      ''      => "$zone:$destination",
-      default => "$zone:$destination:$port_dest",
-    },
-    proto           => 'tcp',
-    destinationport => "$port_orig",
-    originaldest    => "$originaldest",
-    ratelimit       => '-',
-    order           => $order,
+define firewall::router::munin(
+   $destination,
+   $port_orig,
+   $port_dest      = '',
+   $zone           = 'loc',
+   $order          = '400',
+   $originaldest   = $ipaddress
+   $implementation = lookup('firewall::implementation', undef, undef, 'shorewall'),
+) {
+  class { "firewall::implementations::${implementation}::router::munin":
+    destination  => $destination,
+    port_orig    => $port_orig,
+    port_dest    => $port_dest,
+    zone         => $zone,
+    order        => $order,
+    originaldest => $originaldest,
   }
 }