Push the class defaults into hiera
The bind class parameter defaults values are meant to be supplied via module data. Really, these ought to come through the bind::defaults class from hiera, but that class is currently the home of platform defaults which are not meant to be overridden by the user. This is a first step, maybe? A normalization for sure.
This commit is contained in:
parent
d45305563e
commit
c72da6157f
@ -3,8 +3,11 @@ bind::defaults::supported: false
|
|||||||
bind::defaults::random_device: '/dev/random'
|
bind::defaults::random_device: '/dev/random'
|
||||||
|
|
||||||
bind::forwarders: ''
|
bind::forwarders: ''
|
||||||
|
bind::forward: ''
|
||||||
bind::dnssec: true
|
bind::dnssec: true
|
||||||
|
bind::filter_ipv6: false
|
||||||
bind::version: ''
|
bind::version: ''
|
||||||
|
bind::auth_nxdomain: false
|
||||||
bind::include_local: false
|
bind::include_local: false
|
||||||
|
|
||||||
bind::updater::keydir: '/etc/nsupdate-keys'
|
bind::updater::keydir: '/etc/nsupdate-keys'
|
||||||
|
|||||||
@ -1,13 +1,13 @@
|
|||||||
# ex: syntax=puppet si ts=4 sw=4 et
|
# ex: syntax=puppet si ts=4 sw=4 et
|
||||||
|
|
||||||
class bind (
|
class bind (
|
||||||
$forwarders = '',
|
$forwarders = undef,
|
||||||
$forward = undef,
|
$forward = undef,
|
||||||
$dnssec = true,
|
$dnssec = undef,
|
||||||
$filter_ipv6 = false,
|
$filter_ipv6 = undef,
|
||||||
$version = '',
|
$version = undef,
|
||||||
$statistics_port = undef,
|
$statistics_port = undef,
|
||||||
$auth_nxdomain = false,
|
$auth_nxdomain = undef,
|
||||||
$include_default_zones = true,
|
$include_default_zones = true,
|
||||||
$include_local = false,
|
$include_local = false,
|
||||||
) inherits bind::defaults {
|
) inherits bind::defaults {
|
||||||
@ -22,11 +22,6 @@ class bind (
|
|||||||
}
|
}
|
||||||
|
|
||||||
include ::bind::updater
|
include ::bind::updater
|
||||||
# package{'bind-tools':
|
|
||||||
# ensure => latest,
|
|
||||||
# name => $nsupdate_package,
|
|
||||||
# before => Package['bind'],
|
|
||||||
# }
|
|
||||||
|
|
||||||
package { 'bind':
|
package { 'bind':
|
||||||
ensure => latest,
|
ensure => latest,
|
||||||
|
|||||||
@ -21,7 +21,7 @@ options {
|
|||||||
<%- end -%>
|
<%- end -%>
|
||||||
};
|
};
|
||||||
<%- end -%>
|
<%- end -%>
|
||||||
<%- if @forward and @forward != '' -%>
|
<%- if @forward != '' -%>
|
||||||
forward <%= @forward %>;
|
forward <%= @forward %>;
|
||||||
<%- end -%>
|
<%- end -%>
|
||||||
auth-nxdomain <%= @auth_nxdomain ? 'yes' : 'no' %>;
|
auth-nxdomain <%= @auth_nxdomain ? 'yes' : 'no' %>;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user