Spliting firewall classes along files and separating rules for vservers and routers

1 files changed, 8 insertions, 8 deletions

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index 29eef59..79b39bd 100644
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -110,13 +110,13 @@ class nodo::vserver inherits nodo {
     # Apply firewall rules just for running vservers
     case $ensure {
       'running': {
-        firewall::router::ssh { "$name":
+        firewall::vserver::ssh { "$name":
           destination => "192.168.0.$context",
           port_orig => "22$id",
           port_dest => "22",
         }
 
-        firewall::router::munin { "$name":
+        firewall::vserver::munin { "$name":
           destination => "192.168.0.$context",
           port_orig   => "49$id",
           port_dest   => "49$id",
@@ -124,14 +124,14 @@ class nodo::vserver inherits nodo {
 
         if $proxy {
           class {
-            "firewall::router::http":  destination => "192.168.0.$context";
-            "firewall::router::https": destination => "192.168.0.$context";
+            "firewall::vserver::http":  destination => "192.168.0.$context";
+            "firewall::vserver::https": destination => "192.168.0.$context";
           }
         }
 
         if $puppetmaster {
           class {
-            "firewall::router::puppetmaster":
+            "firewall::vserver::puppetmaster":
               destination              => "192.168.0.$context",
               puppetmaster_port        => $puppetmaster_port,
               puppetmaster_nonssl_port => $puppetmaster_nonssl_port,
@@ -140,19 +140,19 @@ class nodo::vserver inherits nodo {
 
         if $gitd {
           class {
-            "firewall::router::gitd": destination => "192.168.0.$context";
+            "firewall::vserver::gitd": destination => "192.168.0.$context";
           }
         }
 
         if $icecast {
           class {
-            "firewall::router::icecast": destination => "192.168.0.$context";
+            "firewall::vserver::icecast": destination => "192.168.0.$context";
           }
         }
 
         if $mail {
           class {
-            "firewall::router::mail": destination => "192.168.0.$context";
+            "firewall::vserver::mail": destination => "192.168.0.$context";
           }
         }
       }