From 3d1cf84f39fece3f2a9f8b7247a792212eb81177 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 8 Jan 2022 15:50:26 -0300 Subject: Feat: major refactor --- manifests/virtual/munin.pp | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) (limited to 'manifests/virtual/munin.pp') diff --git a/manifests/virtual/munin.pp b/manifests/virtual/munin.pp index 79514c6..531acd9 100644 --- a/manifests/virtual/munin.pp +++ b/manifests/virtual/munin.pp @@ -1,28 +1,16 @@ -define firewall::virtual::munin($destination, $port_orig, $port_dest = '', $order = '400', $zone = 'fw') { - 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 => lookup('firewall::external_ip', undef, undef, $::ipaddress), - ratelimit => '-', - order => $order, +define firewall::virtual::munin( + $destination, + $port_orig, + $port_dest = '', + $order = '400', + $zone = 'fw' + $implementation = lookup('firewall::implementation', undef, undef, 'shorewall'), +) { + class { "firewall::implementations::${implementation}::virtual::munin": + destination => $destination, + port_orig => $port_orig, + port_dest => $port_dest, + order => $order, + zone => $zone, } } -- cgit v1.2.3