X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Fgeodns.pp;h=d8155cdf3d5c8791f1f3410825eb61a28cc7f4f0;hb=82a0464b4a123feb828c2bc51b2a6ec3aef1e181;hp=098b112c1cbb65dd17148c27301e8a1c01c7ba87;hpb=71db7e225a187858a962d321ed43ad4eb6e2169a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 098b112c1..d8155cdf3 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -4,6 +4,9 @@ class named::geodns inherits named {
     }
 
     file {
+        "/etc/bind/named.conf.options":
+            content => template("named/named.conf.options.erb"),
+            notify  => Exec["bind9 reload"];
         "/etc/apt/sources.list.d/geoip.list":
             content => template("debian-org/etc/apt/sources.list.d/geoip.list.erb"),
             notify  => Exec["apt-get update"],
@@ -27,8 +30,14 @@ class named::geodns inherits named {
         "/etc/bind/geodns":
             ensure  => directory,
             owner   => root,
+            group   => root,
+            mode    => 755,
+            ;
+        "/etc/bind/geodns/zonefiles":
+            ensure  => directory,
+            owner   => geodnssync,
             group   => geodnssync,
-            mode    => 775,
+            mode    => 755,
             ;
         "/etc/bind/geodns/named.conf.geo":
             source  => [ "puppet:///named/per-host/$fqdn/named.conf.geo",
@@ -38,20 +47,13 @@ class named::geodns inherits named {
             owner   => root,
             group   => root,
             ;
-        "/etc/bind/geodns/recvconf":
-            source  => [ "puppet:///named/per-host/$fqdn/recvconf",
-                         "puppet:///named/common/recvconf" ],
+        "/etc/bind/geodns/trigger":
+            source  => [ "puppet:///named/per-host/$fqdn/trigger",
+                         "puppet:///named/common/trigger" ],
             owner   => root,
             group   => root,
             mode    => 555,
             ;
-        "/etc/bind/geodns/recvconf.files":
-            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:///named/per-host/$fqdn/authorized_keys",
                          "puppet:///named/common/authorized_keys" ],
@@ -59,6 +61,12 @@ class named::geodns inherits named {
             group   => geodnssync,
             mode    => 440,
             ;
+        "/etc/cron.d/dsa-boot-geodnssync":
+            source  => [ "puppet:///named/per-host/$fqdn/cron-geo",
+                         "puppet:///named/common/cron-geo" ],
+            owner   => root,
+            group   => root,
+            ;
     }
 }