Adding back order at munin rules

diff --git a/manifests/subsystems/firewall/router.pp b/manifests/subsystems/firewall/router.pp
index 19484c18e4b21a4d384bbc422256a0ba833046b9..9092fbb073e9d3ca1be3bc10270733deda207f46 100644 (file)
--- a/manifests/subsystems/firewall/router.pp
+++ b/manifests/subsystems/firewall/router.pp
@@ -126,7 +126,7 @@ define firewall::router::ssh($destination, $port_orig = '22', $port_dest = '', $
   }
 }
 
-define firewall::router::munin($destination, $port_orig, $port_dest = '', $zone = 'loc') {
+define firewall::router::munin($destination, $port_orig, $port_dest = '', $zone = 'loc', $order = '400') {
   shorewall::rule { "munin-$name":
     action          => 'DNAT',
     source          => 'all',
@@ -137,6 +137,7 @@ define firewall::router::munin($destination, $port_orig, $port_dest = '', $zone
     proto           => 'tcp',
     destinationport => "$port_orig",
     ratelimit       => '-',
+    order           => $order,
   }
 }
 

diff --git a/manifests/subsystems/firewall/vserver.pp b/manifests/subsystems/firewall/vserver.pp
index 8b01d12e2be80501416fe27dc5103f1b4cdbfa12..843d24f324a37151181cb0bf94a72a8dd98a7bc5 100644 (file)
--- a/manifests/subsystems/firewall/vserver.pp
+++ b/manifests/subsystems/firewall/vserver.pp
@@ -249,7 +249,7 @@ define firewall::vserver::ssh($destination, $port_orig = '22', $port_dest = '',
   }
 }
 
-define firewall::vserver::munin($destination, $port_orig, $port_dest = '') {
+define firewall::vserver::munin($destination, $port_orig, $port_dest = '', $order = '400') {
   shorewall::rule { "munin-$name-1":
     action          => 'DNAT',
     source          => 'net',
@@ -260,6 +260,7 @@ define firewall::vserver::munin($destination, $port_orig, $port_dest = '') {
     proto           => 'tcp',
     destinationport => "$port_orig",
     ratelimit       => '-',
+    order           => $order,
   }
 
   shorewall::rule { "munin-$name-2":
@@ -273,5 +274,6 @@ define firewall::vserver::munin($destination, $port_orig, $port_dest = '') {
     destinationport => "$port_orig",
     originaldest    => "$ipaddress",
     ratelimit       => '-',
+    order           => $order,
   }
 }