reshuffle bind configuration

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

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 0ca7b9d..766c5e5 100644 (file)
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -1,4 +1,8 @@
 class named::geodns inherits named {
+        activate_munin_check {
+                "bind_views": script => bind;
+        }
+
         file {
                 "/etc/apt/sources.list.d/geoip.list":
                         content => template("debian-org/etc/apt/sources.list.d/geoip.list.erb"),
@@ -21,8 +25,7 @@ class named::geodns inherits named {
                         group   => root,
                         ;
                 "/etc/bind/named.conf.options":
-                        source  => [ "puppet:///named/per-host/$fqdn/named.conf.options",
-                                     "puppet:///named/common/named.conf.options" ],
+                        content => template("named/named.conf.options.erb"),
                         require => Package["bind9"],
                         notify  => Exec["bind9 restart"],
                         owner   => root,
@@ -58,14 +61,6 @@ class named::geodns inherits named {
                         mode    => 444,
                         ;
 
-                "/usr/share/GeoIP/GeoIPv6.dat":
-                        source  => [ "puppet:///named/per-host/$fqdn/GeoIPv6.dat",
-                                     "puppet:///named/common/GeoIPv6.dat" ],
-                        owner   => root,
-                        group   => root,
-                        mode    => 444,
-                        ;
-
                 "/etc/ssh/userkeys/geodnssync":
                         source  => [ "puppet:///named/per-host/$fqdn/authorized_keys",
                                      "puppet:///named/common/authorized_keys" ],
@@ -73,12 +68,6 @@ class named::geodns inherits named {
                         group   => geodnssync,
                         mode    => 440,
                         ;
-                "/var/log/bind9":
-                        ensure  => directory,
-                        owner   => bind,
-                        group   => bind,
-                        mode    => 775,
-                        ;
         }
 }