From 2c4e90c14d79c529109003a52feec4e6e04fdc3d Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 7 Jul 2019 11:00:55 +0200 Subject: [PATCH] move named.conf.debian-zones.erb from authoritative to primary --- modules/named/manifests/authoritative.pp | 4 ---- modules/named/manifests/primary.pp | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/named/manifests/authoritative.pp b/modules/named/manifests/authoritative.pp index d33e406ee..b924d6ec2 100644 --- 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 b0df105f8..29f2d6278 100644 --- 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'], + } } -- 2.20.1