X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Fgeodns.pp;h=76cfe3c6e7c4b3df68e002def746e8a1fa225cbc;hb=1fa867119985fcfde6ad93af165dd274afc48feb;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..76cfe3c6e 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -4,21 +4,24 @@ 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"],
             ;
         "/etc/bind/named.conf.local":
-            source  => [ "puppet:///named/per-host/$fqdn/named.conf.local",
-                         "puppet:///named/common/named.conf.local" ],
+            source  => [ "puppet:///modules/named/per-host/$fqdn/named.conf.local",
+                         "puppet:///modules/named/common/named.conf.local" ],
             require => Package["bind9"],
             notify  => Exec["bind9 restart"],
             owner   => root,
             group   => root,
             ;
         "/etc/bind/named.conf.acl":
-            source  => [ "puppet:///named/per-host/$fqdn/named.conf.acl",
-                         "puppet:///named/common/named.conf.acl" ],
+            source  => [ "puppet:///modules/named/per-host/$fqdn/named.conf.acl",
+                         "puppet:///modules/named/common/named.conf.acl" ],
             require => Package["bind9"],
             notify  => Exec["bind9 restart"],
             owner   => root,
@@ -27,38 +30,43 @@ 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",
-                         "puppet:///named/common/named.conf.geo" ],
+            source  => [ "puppet:///modules/named/per-host/$fqdn/named.conf.geo",
+                         "puppet:///modules/named/common/named.conf.geo" ],
             require => Package["bind9"],
             notify  => Exec["bind9 restart"],
             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:///modules/named/per-host/$fqdn/trigger",
+                         "puppet:///modules/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" ],
+            source  => [ "puppet:///modules/named/per-host/$fqdn/authorized_keys",
+                         "puppet:///modules/named/common/authorized_keys" ],
             owner   => root,
             group   => geodnssync,
             mode    => 440,
             ;
+        "/etc/cron.d/dsa-boot-geodnssync":
+            source  => [ "puppet:///modules/named/per-host/$fqdn/cron-geo",
+                         "puppet:///modules/named/common/cron-geo" ],
+            owner   => root,
+            group   => root,
+            ;
     }
 }