add bind munin-node

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

diff --git a/modules/geodns/manifests/init.pp b/modules/geodns/manifests/init.pp
index a0397d0..9df3713 100644 (file)
--- a/modules/geodns/manifests/init.pp
+++ b/modules/geodns/manifests/init.pp
@@ -1,4 +1,5 @@
 class geodns {
+        include munin-node::bind
 
         package {
                 bind9: ensure => installed;
@@ -6,7 +7,7 @@ class geodns {
 
         file {
                 "/etc/apt/sources.list.d/geoip.list":
-                        source => "puppet:///files/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":
@@ -17,14 +18,6 @@ class geodns {
                         owner   => root,
                         group   => root,
                         ;
-                "/etc/bind/named.conf.geo":
-                        source  => [ "puppet:///geodns/per-host/$fqdn/named.conf.geo",
-                                      "puppet:///geodns/common/named.conf.geo" ],
-                        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" ],
@@ -48,6 +41,14 @@ class geodns {
                         group   => geodnssync,
                         mode    => 775,
                         ;
+                "/etc/bind/geodns/named.conf.geo":
+                        source  => [ "puppet:///geodns/per-host/$fqdn/named.conf.geo",
+                                     "puppet:///geodns/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" ],
@@ -63,6 +64,14 @@ class geodns {
                         mode    => 444,
                         ;
 
+                "/usr/share/GeoIP/GeoIPv6.dat":
+                        source  => [ "puppet:///geodns/per-host/$fqdn/GeoIPv6.dat",
+                                     "puppet:///geodns/common/GeoIPv6.dat" ],
+                        owner   => root,
+                        group   => root,
+                        mode    => 444,
+                        ;
+
                 "/etc/ssh/userkeys/geodnssync":
                         source  => [ "puppet:///geodns/per-host/$fqdn/authorized_keys",
                                      "puppet:///geodns/common/authorized_keys" ],
@@ -70,6 +79,12 @@ class geodns {
                         group   => geodnssync,
                         mode    => 440,
                         ;
+                "/var/log/bind9":
+                        ensure  => directory,
+                        owner   => bind,
+                        group   => bind,
+                        mode    => 775,
+                        ;
         }
 
         exec {