From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 7 Jul 2019 09:10:42 +0000 (+0200)
Subject: Add a named.conf.puppet-misc
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9bf11cb6ac1b88d10f2e1e1fdffb0406577e8125;p=mirror%2Fdsa-puppet.git

Add a named.conf.puppet-misc
---

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 7de9a4705..80d6e8bfc 100644
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -50,4 +50,13 @@ class named {
 		group   => bind,
 		notify  => Service['bind9'],
 	}
+
+	concat { '/etc/bind/named.conf.puppet-misc': }
+	concat::fragment { 'dsa-named-conf-puppet-misc---header':
+		target => '/etc/bind/named.conf.puppet-misc',
+		order  => '000',
+		content  => @(EOF)
+			// THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+			| EOF
+	}
 }
diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 8843d845f..4a4627e39 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -115,3 +115,4 @@ acl "dnsnodeapi-ACL" {
 <% end -%>
 
 include "/etc/bind/named.conf.puppet-shared-keys";
+include "/etc/bind/named.conf.puppet-misc";