X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Fgeodns.pp;h=76cfe3c6e7c4b3df68e002def746e8a1fa225cbc;hb=965a8d94b2727a7bc156ee6bb1e7a1459d8895e1;hp=3a41b94da87fb5c7b2153f10eddf54fe88d6ef53;hpb=12df216f8b140efd052fadb0db74f6c01205d089;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 3a41b94da..76cfe3c6e 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -12,16 +12,16 @@ class named::geodns inherits named {
             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,
@@ -40,27 +40,33 @@ class named::geodns inherits named {
             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/trigger":
-            source  => [ "puppet:///named/per-host/$fqdn/trigger",
-                         "puppet:///named/common/trigger" ],
+            source  => [ "puppet:///modules/named/per-host/$fqdn/trigger",
+                         "puppet:///modules/named/common/trigger" ],
             owner   => root,
             group   => root,
             mode    => 555,
             ;
         "/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,
+            ;
     }
 }