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 8cfa4080c24542bc8a690a1cd7604dcc53e4e8e8..28a666b5a1b5ce2f78f467de98f09adc478fda64 100644 (file)
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,37 +1,25 @@
 class named {
-    activate_munin_check {
-        "bind":;
-    }
 
-    package {
-        bind9: ensure => installed;
-    }
+       munin::check { 'bind': }
 
-    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)"
-    }
-}
+       package { 'bind9':
+               ensure => installed
+       }
+
+       service { 'bind9':
+               ensure => running,
+       }
 
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4:
+       @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',
+       }
+}