move named.conf.debian-zones.erb from authoritative to primary

diff --git a/modules/named/manifests/authoritative.pp b/modules/named/manifests/authoritative.pp
index d33e406..b924d6e 100644 (file)
--- a/modules/named/manifests/authoritative.pp
+++ b/modules/named/manifests/authoritative.pp
@@ -1,8 +1,4 @@
 class named::authoritative inherits named {
-       file { '/etc/bind/named.conf.debian-zones':
-               content => template('named/named.conf.debian-zones.erb'),
-               notify  => Service['bind9'],
-       }
        file { '/etc/bind/named.conf.options':
                content => template('named/named.conf.options.erb'),
                notify  => Service['bind9'],

diff --git a/modules/named/manifests/primary.pp b/modules/named/manifests/primary.pp
index b0df105..29f2d62 100644 (file)
--- a/modules/named/manifests/primary.pp
+++ b/modules/named/manifests/primary.pp
@@ -6,4 +6,9 @@ class named::primary inherits named::authoritative {
                description => 'Allow nameserver access',
                rule        => '&TCP_UDP_SERVICE_RANGE(53, ( $HOST_DNS_GEO $HOST_NAGIOS $HOST_RCODE0 $HOST_EASYDNS $HOST_NETNOD ) )',
        }
+
+       file { '/etc/bind/named.conf.debian-zones':
+               content => template('named/named.conf.debian-zones.erb'),
+               notify  => Service['bind9'],
+       }
 }