X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgeodns%2Fmanifests%2Finit.pp;h=9df37135881cd42589f5d81387a0bbbb462ac327;hb=a993bfdd89851979c33354b9d17acaa3f50958cb;hp=542f5584b7e6655ba3dd92935dabf1bf5fd2d85e;hpb=0e36b5db7db8c2aab6c338f0397e910774abe7c4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/geodns/manifests/init.pp b/modules/geodns/manifests/init.pp
index 542f5584b..9df371358 100644
--- 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" ],
@@ -35,12 +28,63 @@ class geodns {
                         ;
                 "/etc/bind/named.conf.options":
                         source  => [ "puppet:///geodns/per-host/$fqdn/named.conf.options",
-                                      "puppet:///geodns/common/named.conf.options" ],
+                                     "puppet:///geodns/common/named.conf.options" ],
+                        require => Package["bind9"],
+                        notify  => Exec["bind9 restart"],
+                        owner   => root,
+                        group   => root,
+                        ;
+
+                "/etc/bind/geodns":
+                        ensure  => directory,
+                        owner   => root,
+                        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" ],
+                        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" ],
+                        owner   => root,
+                        group   => root,
+                        mode    => 444,
+                        ;
+
+                "/etc/ssh/userkeys/geodnssync":
+                        source  => [ "puppet:///geodns/per-host/$fqdn/authorized_keys",
+                                     "puppet:///geodns/common/authorized_keys" ],
+                        owner   => root,
+                        group   => geodnssync,
+                        mode    => 440,
+                        ;
+                "/var/log/bind9":
+                        ensure  => directory,
+                        owner   => bind,
+                        group   => bind,
+                        mode    => 775,
+                        ;
         }
 
         exec {