Use firewall::virtual class names

16 files changed, 16 insertions, 16 deletions

diff --git a/manifests/vm/dns.pp b/manifests/virtual/dns.pp
index a273bcc..f389929 100644
--- a/manifests/vm/dns.pp
+++ b/manifests/virtual/dns.pp
@@ -1,4 +1,4 @@
-class firewall::vm::dns($destination, $zone = 'vm') {
+class firewall::virtual::dns($destination, $zone = 'vm') {
   shorewall::rule { 'dns-route-0':
     action          => 'DNS/ACCEPT',
     source          => 'net',
diff --git a/manifests/vm/gitd.pp b/manifests/virtual/gitd.pp
index 8c497db..23095aa 100644
--- a/manifests/vm/gitd.pp
+++ b/manifests/virtual/gitd.pp
@@ -1,4 +1,4 @@
-class firewall::vm::gitd($destination, $zone = 'fw') {
+class firewall::virtual::gitd($destination, $zone = 'fw') {
   shorewall::rule { 'git-daemon-1':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/gobby.pp b/manifests/virtual/gobby.pp
index 3b113c5..5554a11 100644
--- a/manifests/vm/gobby.pp
+++ b/manifests/virtual/gobby.pp
@@ -1,4 +1,4 @@
-class firewall::vm::gobby($destination, $zone = 'fw') {
+class firewall::virtual::gobby($destination, $zone = 'fw') {
   shorewall::rule { 'gobby-0':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/http.pp b/manifests/virtual/http.pp
index 404d82f..b1e7faa 100644
--- a/manifests/vm/http.pp
+++ b/manifests/virtual/http.pp
@@ -1,4 +1,4 @@
-class firewall::vm::http($destination, $zone = 'vm') {
+class firewall::virtual::http($destination, $zone = 'vm') {
   shorewall::rule { 'http-route-1':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/https.pp b/manifests/virtual/https.pp
index 047ff66..ea900d8 100644
--- a/manifests/vm/https.pp
+++ b/manifests/virtual/https.pp
@@ -1,4 +1,4 @@
-class firewall::vm::https($destination, $zone = 'vm') {
+class firewall::virtual::https($destination, $zone = 'vm') {
   shorewall::rule { 'https-route-1':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/icecast.pp b/manifests/virtual/icecast.pp
index b7bc2fe..1681f18 100644
--- a/manifests/vm/icecast.pp
+++ b/manifests/virtual/icecast.pp
@@ -1,4 +1,4 @@
-class firewall::vm::icecast($destination, $zone = 'fw') {
+class firewall::virtual::icecast($destination, $zone = 'fw') {
   shorewall::rule { 'icecast-1':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/jabber.pp b/manifests/virtual/jabber.pp
index db26d6b..0bba4e9 100644
--- a/manifests/vm/jabber.pp
+++ b/manifests/virtual/jabber.pp
@@ -1,4 +1,4 @@
-class firewall::vm::jabber($destination, $zone = 'fw') {
+class firewall::virtual::jabber($destination, $zone = 'fw') {
   shorewall::rule { 'jabber-0':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/mail.pp b/manifests/virtual/mail.pp
index f629865..83589ce 100644
--- a/manifests/vm/mail.pp
+++ b/manifests/virtual/mail.pp
@@ -1,4 +1,4 @@
-class firewall::vm::mail($destination, $zone = 'fw') {
+class firewall::virtual::mail($destination, $zone = 'fw') {
   shorewall::rule { 'mail-1':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/mdns.pp b/manifests/virtual/mdns.pp
index 644c889..db8ec25 100644
--- a/manifests/vm/mdns.pp
+++ b/manifests/virtual/mdns.pp
@@ -1,4 +1,4 @@
-class firewall::vm::mdns($destination, $zone = 'fw') {
+class firewall::virtual::mdns($destination, $zone = 'fw') {
   shorewall::rule { 'mdns-0':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/mumble.pp b/manifests/virtual/mumble.pp
index 321ab07..45ab393 100644
--- a/manifests/vm/mumble.pp
+++ b/manifests/virtual/mumble.pp
@@ -1,4 +1,4 @@
-class firewall::vm::mumble($destination, $zone = 'fw') {
+class firewall::virtual::mumble($destination, $zone = 'fw') {
   shorewall::rule { 'mumble-0':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/munin.pp b/manifests/virtual/munin.pp
index e92e216..b8bfce1 100644
--- a/manifests/vm/munin.pp
+++ b/manifests/virtual/munin.pp
@@ -1,4 +1,4 @@
-define firewall::vm::munin($destination, $port_orig, $port_dest = '', $order = '400', $zone = 'fw') {
+define firewall::virtual::munin($destination, $port_orig, $port_dest = '', $order = '400', $zone = 'fw') {
   shorewall::rule { "munin-$name-1":
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/puppetmaster.pp b/manifests/virtual/puppetmaster.pp
index a097d77..e54c166 100644
--- a/manifests/vm/puppetmaster.pp
+++ b/manifests/virtual/puppetmaster.pp
@@ -1,4 +1,4 @@
-class firewall::vm::puppetmaster($destination, $puppetmaster_port = '8140', $puppetmaster_nonssl_port = '8141', $zone = 'fw') {
+class firewall::virtual::puppetmaster($destination, $puppetmaster_port = '8140', $puppetmaster_nonssl_port = '8141', $zone = 'fw') {
   shorewall::rule { 'puppetmaster-1':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/rsync.pp b/manifests/virtual/rsync.pp
index 6ee9c98..50df46c 100644
--- a/manifests/vm/rsync.pp
+++ b/manifests/virtual/rsync.pp
@@ -1,4 +1,4 @@
-class firewall::vm::rsync($destination, $zone = 'fw') {
+class firewall::virtual::rsync($destination, $zone = 'fw') {
   shorewall::rule { 'rsync-0':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/ssh.pp b/manifests/virtual/ssh.pp
index f9586da..4832b58 100644
--- a/manifests/vm/ssh.pp
+++ b/manifests/virtual/ssh.pp
@@ -1,4 +1,4 @@
-define firewall::vm::ssh($destination, $port_orig = '22', $port_dest = '', $zone = 'vm') {
+define firewall::virtual::ssh($destination, $port_orig = '22', $port_dest = '', $zone = 'vm') {
   shorewall::rule { "ssh-$name-1":
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/tor.pp b/manifests/virtual/tor.pp
index cd8820a..4d336c6 100644
--- a/manifests/vm/tor.pp
+++ b/manifests/virtual/tor.pp
@@ -1,4 +1,4 @@
-class firewall::vm::tor($destination, $zone = 'fw') {
+class firewall::virtual::tor($destination, $zone = 'fw') {
   shorewall::rule { 'tor-0':
     action          => 'DNAT',
     source          => 'net',
diff --git a/manifests/vm/yacy.pp b/manifests/virtual/yacy.pp
index 0ddbf4b..173ba13 100644
--- a/manifests/vm/yacy.pp
+++ b/manifests/virtual/yacy.pp
@@ -1,4 +1,4 @@
-class firewall::vm::yacy($destination, $zone = 'fw') {
+class firewall::virtual::yacy($destination, $zone = 'fw') {
   shorewall::rule { 'yacy-0':
     action          => 'DNAT',
     source          => 'net',