X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Finit.pp;h=b5233758f7d6fd30a6f7927440d3241168cdbe09;hb=cab61105c047ee9d4f521b65eaebf1e0f6e9e736;hp=73c7cdcb31caf45f34d00cf8034df30d256f5aec;hpb=12c125eacc345b91fb22182272665cf22f00f5e7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 73c7cdcb3..b5233758f 100644
--- 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,9 +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)"
         }
 }