From 1658fd82c31b4e9377c3f1dc57b244e82a2d0481 Mon Sep 17 00:00:00 2001
From: Nate Riffe <inkblot@movealong.org>
Date: Tue, 22 Sep 2015 20:19:30 -0500
Subject: [PATCH 1/2] Set managed-keys-directory

This is needed on RedHat derivatives.
---
 data/osfamily/RedHat.yaml | 1 +
 manifests/params.pp       | 1 +
 templates/named.conf.erb  | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/data/osfamily/RedHat.yaml b/data/osfamily/RedHat.yaml
index fc16e8a..e170f3b 100644
--- a/data/osfamily/RedHat.yaml
+++ b/data/osfamily/RedHat.yaml
@@ -5,6 +5,7 @@ bind::params::bind_group: 'named'
 bind::params::bind_package: 'bind'
 bind::params::bind_service: 'named'
 bind::params::nsupdate_package: 'bind-utils'
+bind::params::managed_keys_directory: '/var/named/dynamic'
 bind::namedconf: '/etc/named.conf'
 bind::confdir: '/etc/named'
 bind::cachedir: '/var/named'
diff --git a/manifests/params.pp b/manifests/params.pp
index 36fc987..158d8a1 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -7,6 +7,7 @@ class bind::params (
     $bind_package,
     $bind_service,
     $nsupdate_package,
+    $managed_keys_directory = nil,
 ) {
     unless $supported {
         fail('Platform is not supported')
diff --git a/templates/named.conf.erb b/templates/named.conf.erb
index 070bc04..4a20816 100644
--- a/templates/named.conf.erb
+++ b/templates/named.conf.erb
@@ -11,6 +11,9 @@ statistics-channels {
 
 options {
 	directory "<%= @cachedir %>";
+<%- if @managed_keys_directory and @managed_keys_directory != '' -%>
+	managed-keys-directory "<%= @managed_keys_directory %>";
+<%- end -%>
 <%- if @forwarders and @forwarders != '' -%>
 	forwarders {
 <%-   Array(@forwarders).each do |forwarder| -%>

From 05b679a93d3f856cdcf1d7df575fe4e46422c047 Mon Sep 17 00:00:00 2001
From: Nate Riffe <inkblot@movealong.org>
Date: Sat, 24 Oct 2015 09:40:35 -0500
Subject: [PATCH 2/2] Fix a scoping issue in the template

---
 manifests/init.pp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index 881c39e..314fed2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -14,6 +14,9 @@ class bind (
 ) {
     include ::bind::params
 
+    # Re-scope members of bind::params for templating
+    $managed_keys_directory = $::bind::params::managed_keys_directory
+
     $auth_nxdomain = false
 
     File {