get rid of way too many munin subclasses

[mirror/dsa-puppet.git] / modules / named / manifests / init.pp

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 0bbcde3..b523375 100644 (file)
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,5 +1,7 @@
 class named {
-        include munin-node::bind
+        activate_munin_check {
+                "bind":;
+        }
 
         package {
                 bind9: ensure => installed;
@@ -25,10 +27,10 @@ class named {
                         mode    => 775,
                         ;
         }
-        ferm::rule { "dsa-bind":
+        @ferm::rule { "dsa-bind":
                 domain          => "(ip ip6)",
                 description     => "Allow nameserver access",
-                rule            => "proto (udp tcp) mod state state (NEW) dport (53) ACCEPT"
+                rule            => "&TCP_UDP_SERVICE(53)"
         }
 }