From 69b6037ee16bdccb443ae3ac822f477ee2963d29 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 9 Aug 2011 15:14:04 -0300
Subject: Fixing resource naming for firewall rules (2)

---
 manifests/subsystems/firewall.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'manifests/subsystems/firewall.pp')

diff --git a/manifests/subsystems/firewall.pp b/manifests/subsystems/firewall.pp
index fca990d..75b2b17 100644
--- 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 ? {
-- 
cgit v1.2.3