From: Peter Palfrader Date: Sun, 7 Jul 2019 09:29:48 +0000 (+0200) Subject: reorder ACLs and shared keys on primary X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=70b9684213d5357890cc37a4a1c54864c43b4d92;p=mirror%2Fdsa-puppet.git reorder ACLs and shared keys on primary --- diff --git a/modules/named/manifests/primary.pp b/modules/named/manifests/primary.pp index 630bccee3..f81b55953 100644 --- a/modules/named/manifests/primary.pp +++ b/modules/named/manifests/primary.pp @@ -12,17 +12,17 @@ class named::primary inherits named::authoritative { notify => Service['bind9'], } - concat::fragment { 'dsa-named-conf-puppet-misc---named.conf.external-secondaries-ACLs': - target => '/etc/bind/named.conf.puppet-misc', - order => '010', - content => template('named/named.conf.external-secondaries-ACLs.erb'), - } - concat::fragment { 'dsa-named-conf-puppet-misc---local-shared-keys': target => '/etc/bind/named.conf.puppet-misc', - order => '011', + order => '020', content => @(EOF), include "/etc/bind/named.conf.shared-keys"; | EOF } + concat::fragment { 'dsa-named-conf-puppet-misc---named.conf.external-secondaries-ACLs': + target => '/etc/bind/named.conf.puppet-misc', + order => '025', + content => template('named/named.conf.external-secondaries-ACLs.erb'), + } + }