From: Stephen Gran <steve@lobefin.net>
Date: Sun, 18 Oct 2009 00:16:02 +0000 (+0100)
Subject: and again with the paths
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5ac8ff2214288d50b7ddef3915650d6c9e65c89b;p=mirror%2Fdsa-puppet.git

and again with the paths

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 076600b3f..0ca7b9d8c 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -6,7 +6,7 @@ class named::geodns inherits named {
                         ;
                 "/etc/bind/named.conf.local":
                         source  => [ "puppet:///named/per-host/$fqdn/named.conf.local",
-                                     "puppet:///named/per-host/named.conf.local" ],
+                                     "puppet:///named/common/named.conf.local" ],
                         require => Package["bind9"],
                         notify  => Exec["bind9 restart"],
                         owner   => root,
@@ -14,7 +14,7 @@ class named::geodns inherits named {
                         ;
                 "/etc/bind/named.conf.acl":
                         source  => [ "puppet:///named/per-host/$fqdn/named.conf.acl",
-                                     "puppet:///named/per-host/named.conf.acl" ],
+                                     "puppet:///named/common/named.conf.acl" ],
                         require => Package["bind9"],
                         notify  => Exec["bind9 restart"],
                         owner   => root,
@@ -22,7 +22,7 @@ class named::geodns inherits named {
                         ;
                 "/etc/bind/named.conf.options":
                         source  => [ "puppet:///named/per-host/$fqdn/named.conf.options",
-                                     "puppet:///named/per-host/named.conf.options" ],
+                                     "puppet:///named/common/named.conf.options" ],
                         require => Package["bind9"],
                         notify  => Exec["bind9 restart"],
                         owner   => root,
@@ -37,7 +37,7 @@ class named::geodns inherits named {
                         ;
                 "/etc/bind/geodns/named.conf.geo":
                         source  => [ "puppet:///named/per-host/$fqdn/named.conf.geo",
-                                     "puppet:///named/per-host/named.conf.geo" ],
+                                     "puppet:///named/common/named.conf.geo" ],
                         require => Package["bind9"],
                         notify  => Exec["bind9 restart"],
                         owner   => root,
@@ -45,14 +45,14 @@ class named::geodns inherits named {
                         ;
                 "/etc/bind/geodns/recvconf":
                         source  => [ "puppet:///named/per-host/$fqdn/recvconf",
-                                     "puppet:///named/per-host/recvconf" ],
+                                     "puppet:///named/common/recvconf" ],
                         owner   => root,
                         group   => root,
                         mode    => 555,
                         ;
                 "/etc/bind/geodns/recvconf.files":
                         source  => [ "puppet:///named/per-host/$fqdn/recvconf.files",
-                                     "puppet:///named/per-host/recvconf.files" ],
+                                     "puppet:///named/common/recvconf.files" ],
                         owner   => root,
                         group   => root,
                         mode    => 444,
@@ -60,7 +60,7 @@ class named::geodns inherits named {
 
                 "/usr/share/GeoIP/GeoIPv6.dat":
                         source  => [ "puppet:///named/per-host/$fqdn/GeoIPv6.dat",
-                                     "puppet:///named/per-host/GeoIPv6.dat" ],
+                                     "puppet:///named/common/GeoIPv6.dat" ],
                         owner   => root,
                         group   => root,
                         mode    => 444,
@@ -68,7 +68,7 @@ class named::geodns inherits named {
 
                 "/etc/ssh/userkeys/geodnssync":
                         source  => [ "puppet:///named/per-host/$fqdn/authorized_keys",
-                                     "puppet:///named/per-host/authorized_keys" ],
+                                     "puppet:///named/common/authorized_keys" ],
                         owner   => root,
                         group   => geodnssync,
                         mode    => 440,