Merge branch 'managed-keys-directory'

This commit is contained in:
Nate Riffe 2015-12-19 09:15:41 -06:00
commit c595a5da7a
4 changed files with 8 additions and 0 deletions

View File

@ -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'

View File

@ -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 {

View File

@ -7,6 +7,7 @@ class bind::params (
$bind_package,
$bind_service,
$nsupdate_package,
$managed_keys_directory = nil,
) {
unless $supported {
fail('Platform is not supported')

View File

@ -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| -%>