Adding firewall::vserver::mdns for avahi support

diff --git a/manifests/subsystems/firewall/vserver.pp b/manifests/subsystems/firewall/vserver.pp
index 97571a93234e71606b857171187c4d7059935ba4..702acc9530f6c8b939109ba01ad2ea1a66549c2b 100644 (file)
--- a/manifests/subsystems/firewall/vserver.pp
+++ b/manifests/subsystems/firewall/vserver.pp
@@ -510,3 +510,15 @@ class firewall::vserver::rsync($destination, $zone = 'fw') {
     order           => 2600,
   }
 }
+
+class firewall::vserver::mdns($destination, $zone = 'fw') {
+  shorewall::rule { 'mdns-0':
+    action          => 'DNAT',
+    source          => 'net',
+    destination     => "$zone:$destination:5353",
+    proto           => 'tcp',
+    destinationport => '5353',
+    ratelimit       => '-',
+    order           => 2700,
+  }
+}

diff --git a/manifests/vserver/instance.pp b/manifests/vserver/instance.pp
index dba9abbd077145a97a6023e59f117d8fd0549db7..28dd85d50ec31c2431ffe68f8b6316ca05c10f3b 100644 (file)
--- a/manifests/vserver/instance.pp
+++ b/manifests/vserver/instance.pp
@@ -4,7 +4,7 @@ define nodo::vserver::instance($context, $ensure = 'running', $proxy = false,
                 $icecast = false, $sound = false, $tor = false,
                 $ticket = false, $memory_limit = false, $distro = 'squeeze',
                 $dns = false, $munin_port = false, $monkeysphere_ssh_port = false,
-                $jabber = false, $mumble = false, $gobby = false, $yacy = false, $rsync = false) {
+                $jabber = false, $mumble = false, $gobby = false, $yacy = false, $rsync = false, $avahi = false) {
 
   # set instance id
   if $context <= 9 {
@@ -175,6 +175,12 @@ define nodo::vserver::instance($context, $ensure = 'running', $proxy = false,
           "firewall::vserver::rsync": destination => "192.168.0.$context";
         }
       }
+
+      if $avahi {
+        class {
+          "firewall::vserver::mdns": destination => "192.168.0.$context";
+        }
+      }
     }
   }
 }