massive style guide fixups

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

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 0bbcde3219923f6ee5da64b60712a20da357aa4e..28a666b5a1b5ce2f78f467de98f09adc478fda64 100644 (file)
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,35 +1,25 @@
 class named {
-        include munin-node::bind
 
-        package {
-                bind9: ensure => installed;
-        }
+       munin::check { 'bind': }
 
-        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"
-        }
-}
+       package { 'bind9':
+               ensure => installed
+       }
+
+       service { 'bind9':
+               ensure => running,
+       }
 
-# vim: set fdm=marker ts=8 sw=8 et:
+       @ferm::rule { 'dsa-bind':
+               domain      => '(ip ip6)',
+               description => 'Allow nameserver access',
+               rule        => '&TCP_UDP_SERVICE(53)'
+       }
+
+       file { '/var/log/bind9':
+               ensure => directory,
+               owner  => bind,
+               group  => bind,
+               mode   => '0775',
+       }
+}