Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

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

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 076600b..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"),
@@ -6,7 +10,7 @@ class named::geodns inherits named {
                         ;
                 "/etc/bind/named.conf.local":
                         source  => [ "puppet:///named/per-host/$fqdn/named.conf.local",
-                                     "puppet:///named/per-host/named.conf.local" ],
+                                     "puppet:///named/common/named.conf.local" ],
                         require => Package["bind9"],
                         notify  => Exec["bind9 restart"],
                         owner   => root,
@@ -14,15 +18,14 @@ class named::geodns inherits named {
                         ;
                 "/etc/bind/named.conf.acl":
                         source  => [ "puppet:///named/per-host/$fqdn/named.conf.acl",
-                                     "puppet:///named/per-host/named.conf.acl" ],
+                                     "puppet:///named/common/named.conf.acl" ],
                         require => Package["bind9"],
                         notify  => Exec["bind9 restart"],
                         owner   => root,
                         group   => root,
                         ;
                 "/etc/bind/named.conf.options":
-                        source  => [ "puppet:///named/per-host/$fqdn/named.conf.options",
-                                     "puppet:///named/per-host/named.conf.options" ],
+                        content => template("named/named.conf.options.erb"),
                         require => Package["bind9"],
                         notify  => Exec["bind9 restart"],
                         owner   => root,
@@ -37,7 +40,7 @@ class named::geodns inherits named {
                         ;
                 "/etc/bind/geodns/named.conf.geo":
                         source  => [ "puppet:///named/per-host/$fqdn/named.conf.geo",
-                                     "puppet:///named/per-host/named.conf.geo" ],
+                                     "puppet:///named/common/named.conf.geo" ],
                         require => Package["bind9"],
                         notify  => Exec["bind9 restart"],
                         owner   => root,
@@ -45,22 +48,14 @@ class named::geodns inherits named {
                         ;
                 "/etc/bind/geodns/recvconf":
                         source  => [ "puppet:///named/per-host/$fqdn/recvconf",
-                                     "puppet:///named/per-host/recvconf" ],
+                                     "puppet:///named/common/recvconf" ],
                         owner   => root,
                         group   => root,
                         mode    => 555,
                         ;
                 "/etc/bind/geodns/recvconf.files":
                         source  => [ "puppet:///named/per-host/$fqdn/recvconf.files",
-                                     "puppet:///named/per-host/recvconf.files" ],
-                        owner   => root,
-                        group   => root,
-                        mode    => 444,
-                        ;
-
-                "/usr/share/GeoIP/GeoIPv6.dat":
-                        source  => [ "puppet:///named/per-host/$fqdn/GeoIPv6.dat",
-                                     "puppet:///named/per-host/GeoIPv6.dat" ],
+                                     "puppet:///named/common/recvconf.files" ],
                         owner   => root,
                         group   => root,
                         mode    => 444,
@@ -68,17 +63,11 @@ class named::geodns inherits named {
 
                 "/etc/ssh/userkeys/geodnssync":
                         source  => [ "puppet:///named/per-host/$fqdn/authorized_keys",
-                                     "puppet:///named/per-host/authorized_keys" ],
+                                     "puppet:///named/common/authorized_keys" ],
                         owner   => root,
                         group   => geodnssync,
                         mode    => 440,
                         ;
-                "/var/log/bind9":
-                        ensure  => directory,
-                        owner   => bind,
-                        group   => bind,
-                        mode    => 775,
-                        ;
         }
 }