X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Finit.pp;h=8cfa4080c24542bc8a690a1cd7604dcc53e4e8e8;hb=1fa867119985fcfde6ad93af165dd274afc48feb;hp=65d4cc5f1ab40a0ae0a23be819bf99cac10d7196;hpb=78ceca7ca6540a83d24a89016263235c923543db;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 65d4cc5f1..8cfa4080c 100644
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,35 +1,37 @@
 class named {
-        include munin-node::bind
+    activate_munin_check {
+        "bind":;
+    }
 
-        package {
-                bind9: ensure => installed;
-        }
+    package {
+        bind9: ensure => installed;
+    }
 
-        exec {
-                "bind9 restart":
-                        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-                        refreshonly => true,
-                        ;
-        }
-        exec {
-                "bind9 reload":
-                        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-                        refreshonly => true,
-                        ;
-        }
-        file {
-                "/var/log/bind9":
-                        ensure  => directory,
-                        owner   => bind,
-                        group   => bind,
-                        mode    => 775,
-                        ;
-        }
-        @ferm::rule { "dsa-bind":
-                domain          => "(ip ip6)",
-                description     => "Allow nameserver access",
-                rule            => "proto (udp tcp) mod state state (NEW) dport (53) ACCEPT"
-        }
+    exec {
+        "bind9 restart":
+            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+            refreshonly => true,
+            ;
+        "bind9 reload":
+            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+            refreshonly => true,
+            ;
+    }
+    file {
+        "/var/log/bind9":
+            ensure  => directory,
+            owner   => bind,
+            group   => bind,
+            mode    => 775,
+            ;
+    }
+    @ferm::rule { "dsa-bind":
+        domain          => "(ip ip6)",
+        description     => "Allow nameserver access",
+        rule            => "&TCP_UDP_SERVICE(53)"
+    }
 }
 
-# vim: set fdm=marker ts=8 sw=8 et:
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: