Changing default zone for firewall::router rules

diff --git a/manifests/subsystems/firewall/router.pp b/manifests/subsystems/firewall/router.pp
index 4a0140382fe57ef0dfc73f7528096269d8730037..938484998b8eeb5b96dae802bc69d0c75754480c 100644 (file)
--- a/manifests/subsystems/firewall/router.pp
+++ b/manifests/subsystems/firewall/router.pp
@@ -1,4 +1,4 @@
-class firewall::router::http($destination, $zone = 'vm') {
+class firewall::router::http($destination, $zone = 'loc') {
   shorewall::rule { 'http-route':
     action          => 'DNAT',
     source          => 'all',
@@ -10,7 +10,7 @@ class firewall::router::http($destination, $zone = 'vm') {
   }
 }
 
-class firewall::router::https($destination, $zone = 'vm') {
+class firewall::router::https($destination, $zone = 'loc') {
   shorewall::rule { 'https-route':
     action          => 'DNAT',
     source          => 'all',
@@ -22,7 +22,7 @@ class firewall::router::https($destination, $zone = 'vm') {
   }
 }
 
-class firewall::router::puppetmaster($destination, $puppetmaster_port = '8140', $puppetmaster_nonssl_port = '8141', $zone = 'fw') {
+class firewall::router::puppetmaster($destination, $puppetmaster_port = '8140', $puppetmaster_nonssl_port = '8141', $zone = 'loc') {
   shorewall::rule { 'puppetmaster-1':
     action          => 'DNAT',
     source          => 'all',
@@ -64,7 +64,7 @@ class firewall::router::puppetmaster($destination, $puppetmaster_port = '8140',
   }
 }
 
-class firewall::router::gitd($destination, $zone = 'fw') {
+class firewall::router::gitd($destination, $zone = 'loc') {
   shorewall::rule { 'git-daemon':
     action          => 'DNAT',
     source          => 'net',
@@ -76,7 +76,7 @@ class firewall::router::gitd($destination, $zone = 'fw') {
   }
 }
 
-class firewall::router::icecast($destination, $zone = 'fw') {
+class firewall::router::icecast($destination, $zone = 'loc') {
   shorewall::rule { 'icecast-1':
     action          => 'DNAT',
     source          => 'net',
@@ -99,7 +99,7 @@ class firewall::router::icecast($destination, $zone = 'fw') {
   }
 }
 
-class firewall::router::mail($destination, $zone = 'fw') {
+class firewall::router::mail($destination, $zone = 'loc') {
   shorewall::rule { 'mail-1':
     action          => 'DNAT',
     source          => 'all',
@@ -121,7 +121,7 @@ class firewall::router::mail($destination, $zone = 'fw') {
   }
 }
 
-define firewall::router::ssh($destination, $port_orig = '22', $port_dest = '', $zone = 'vm') {
+define firewall::router::ssh($destination, $port_orig = '22', $port_dest = '', $zone = 'loc') {
   shorewall::rule { "ssh-$name":
     action          => 'DNAT',
     source          => 'all',
@@ -136,7 +136,7 @@ define firewall::router::ssh($destination, $port_orig = '22', $port_dest = '', $
   }
 }
 
-define firewall::router::munin($destination, $port_orig, $port_dest = '', $zone = 'fw') {
+define firewall::router::munin($destination, $port_orig, $port_dest = '', $zone = 'loc') {
   shorewall::rule { "munin-$name":
     action          => 'DNAT',
     source          => 'all',
@@ -151,7 +151,7 @@ define firewall::router::munin($destination, $port_orig, $port_dest = '', $zone
   }
 }
 
-class firewall::router::torrent($destination, $zone = 'fw') {
+class firewall::router::torrent($destination, $zone = 'loc') {
   shorewall::rule { "torrent-tcp":
     action          => 'DNAT',
     source          => 'all',