X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Fgeodns%2Fmanifests%2Finit.pp;h=5e4feaf05a42e04be6dca65ff09fd6d4c175f52b;hb=72c46c82087f79682f4e524a2fa593d06eb984cd;hp=a0397d07ee9c59aec1dd87117095b707f00f17db;hpb=76cb048af5009b827b27745dcf46e7503b4b7944;p=mirror%2Fdsa-puppet.git

diff --git a/modules/geodns/manifests/init.pp b/modules/geodns/manifests/init.pp
index a0397d07e..5e4feaf05 100644
--- a/modules/geodns/manifests/init.pp
+++ b/modules/geodns/manifests/init.pp
@@ -17,14 +17,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 +40,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 +63,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 +78,12 @@ class geodns {
                         group   => geodnssync,
                         mode    => 440,
                         ;
+                "/var/log/bind9":
+                        ensure  => directory,
+                        owner   => bind,
+                        group   => bind,
+                        mode    => 775,
+                        ;
         }
 
         exec {