X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Fgeodns.pp;h=191f898efece346ff69e3f58ec937ed73d8aca0e;hb=9642474c23df62e15a54a82b78fb8658f86fcf38;hp=e9ef8efd7f352c8ff285ebe87c0b059559759b77;hpb=dbd62982af66658f4d50e06ba125cc60545b59a3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index e9ef8efd7..191f898ef 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -1,28 +1,32 @@
 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"),
                         notify  => Exec["apt-get update"],
                         ;
                 "/etc/bind/named.conf.local":
-                        source  => [ "puppet:///geodns/per-host/$fqdn/named.conf.local",
-                                     "puppet:///geodns/common/named.conf.local" ],
+                        source  => [ "puppet:///named/per-host/$fqdn/named.conf.local",
+                                     "puppet:///named/common/named.conf.local" ],
                         require => Package["bind9"],
                         notify  => Exec["bind9 restart"],
                         owner   => root,
                         group   => root,
                         ;
                 "/etc/bind/named.conf.acl":
-                        source  => [ "puppet:///geodns/per-host/$fqdn/named.conf.acl",
-                                     "puppet:///geodns/common/named.conf.acl" ],
+                        source  => [ "puppet:///named/per-host/$fqdn/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:///geodns/per-host/$fqdn/named.conf.options",
-                                     "puppet:///geodns/common/named.conf.options" ],
+                        source  => [ "puppet:///named/per-host/$fqdn/named.conf.options",
+                                     "puppet:///named/common/named.conf.options" ],
                         require => Package["bind9"],
                         notify  => Exec["bind9 restart"],
                         owner   => root,
@@ -36,39 +40,31 @@ class named::geodns inherits named {
                         mode    => 775,
                         ;
                 "/etc/bind/geodns/named.conf.geo":
-                        source  => [ "puppet:///geodns/per-host/$fqdn/named.conf.geo",
-                                     "puppet:///geodns/common/named.conf.geo" ],
+                        source  => [ "puppet:///named/per-host/$fqdn/named.conf.geo",
+                                     "puppet:///named/common/named.conf.geo" ],
                         require => Package["bind9"],
                         notify  => Exec["bind9 restart"],
                         owner   => root,
                         group   => root,
                         ;
                 "/etc/bind/geodns/recvconf":
-                        source  => [ "puppet:///geodns/per-host/$fqdn/recvconf",
-                                     "puppet:///geodns/common/recvconf" ],
+                        source  => [ "puppet:///named/per-host/$fqdn/recvconf",
+                                     "puppet:///named/common/recvconf" ],
                         owner   => root,
                         group   => root,
                         mode    => 555,
                         ;
                 "/etc/bind/geodns/recvconf.files":
-                        source  => [ "puppet:///geodns/per-host/$fqdn/recvconf.files",
-                                     "puppet:///geodns/common/recvconf.files" ],
-                        owner   => root,
-                        group   => root,
-                        mode    => 444,
-                        ;
-
-                "/usr/share/GeoIP/GeoIPv6.dat":
-                        source  => [ "puppet:///geodns/per-host/$fqdn/GeoIPv6.dat",
-                                     "puppet:///geodns/common/GeoIPv6.dat" ],
+                        source  => [ "puppet:///named/per-host/$fqdn/recvconf.files",
+                                     "puppet:///named/common/recvconf.files" ],
                         owner   => root,
                         group   => root,
                         mode    => 444,
                         ;
 
                 "/etc/ssh/userkeys/geodnssync":
-                        source  => [ "puppet:///geodns/per-host/$fqdn/authorized_keys",
-                                     "puppet:///geodns/common/authorized_keys" ],
+                        source  => [ "puppet:///named/per-host/$fqdn/authorized_keys",
+                                     "puppet:///named/common/authorized_keys" ],
                         owner   => root,
                         group   => geodnssync,
                         mode    => 440,