Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

[mirror/dsa-puppet.git] / modules / named / manifests / geodns.pp

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 5503919..766c5e5 100644 (file)
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -4,9 +4,6 @@ class named::geodns inherits named {
         }
 
         file {
-                "/tmp/test":
-                        content => template("named/class-test.erb")
-                        ;
                 "/etc/apt/sources.list.d/geoip.list":
                         content => template("debian-org/etc/apt/sources.list.d/geoip.list.erb"),
                         notify  => Exec["apt-get update"],
@@ -20,15 +17,15 @@ class named::geodns inherits named {
                         group   => root,
                         ;
                 "/etc/bind/named.conf.acl":
-                        content => template("named/named.conf.acl.erb"),
+                        source  => [ "puppet:///named/per-host/$fqdn/named.conf.acl",
+                                     "puppet:///named/common/named.conf.acl" ],
                         require => Package["bind9"],
                         notify  => Exec["bind9 restart"],
                         owner   => root,
                         group   => root,
                         ;
                 "/etc/bind/named.conf.options":
-                        source  => [ "puppet:///named/per-host/$fqdn/named.conf.options",
-                                     "puppet:///named/common/named.conf.options" ],
+                        content => template("named/named.conf.options.erb"),
                         require => Package["bind9"],
                         notify  => Exec["bind9 restart"],
                         owner   => root,