Fixing resource naming for firewall rules (2)

diff --git a/manifests/subsystems/firewall.pp b/manifests/subsystems/firewall.pp
index fca990d8c5a979964f4f05e00f4b512b935f3c19..75b2b171a4e7f035c07bfc2365443214289824fc 100644 (file)
--- a/manifests/subsystems/firewall.pp
+++ b/manifests/subsystems/firewall.pp
@@ -568,7 +568,7 @@ class firewall::router::mail($destination) {
 }
 
 define firewall::router::ssh($destination, $port_orig = '22', $port_dest = '') {
-  shorewall::rule { "ssh-$port_orig-1":
+  shorewall::rule { "ssh-$name-1":
     action          => 'DNAT',
     source          => 'net',
     destination     => $port_dest ? {
@@ -581,7 +581,7 @@ define firewall::router::ssh($destination, $port_orig = '22', $port_dest = '') {
     order           => "2$port_orig",
   }
 
-  shorewall::rule { "ssh-$port_orig-2":
+  shorewall::rule { "ssh-$name-2":
     action          => 'DNAT',
     source          => '$FW',
     destination     => $port_dest ? {
@@ -597,7 +597,7 @@ define firewall::router::ssh($destination, $port_orig = '22', $port_dest = '') {
 }
 
 define firewall::router::munin($destination, $port_orig, $port_dest = '') {
-  shorewall::rule { "munin-$port_orig-1":
+  shorewall::rule { "munin-$name-1":
     action          => 'DNAT',
     source          => 'net',
     destination     => $port_dest ? {
@@ -610,7 +610,7 @@ define firewall::router::munin($destination, $port_orig, $port_dest = '') {
     order           => "4$id",
   }
 
-  shorewall::rule { "munin-$port_orig-2":
+  shorewall::rule { "munin-$name-2":
     action          => 'DNAT',
     source          => '$FW',
     destination     => $port_dest ? {