diff --git a/data/osfamily/Debian.yaml b/data/osfamily/Debian.yaml index e72fc0a..e6ba19f 100644 --- a/data/osfamily/Debian.yaml +++ b/data/osfamily/Debian.yaml @@ -10,5 +10,6 @@ bind::defaults::namedconf: '/etc/bind/named.conf' bind::defaults::cachedir: '/var/cache/bind' bind::defaults::logdir: '/var/log/bind' bind::defaults::default_zones_include: '/etc/bind/named.conf.default-zones' +bind::defaults::isc_bind_keys: '/etc/bind/bind.keys' bind::updater::keydir: '/etc/bind/keys' diff --git a/data/osfamily/RedHat.yaml b/data/osfamily/RedHat.yaml index 2bfeb2e..5c0a82a 100644 --- a/data/osfamily/RedHat.yaml +++ b/data/osfamily/RedHat.yaml @@ -12,5 +12,6 @@ bind::defaults::cachedir: '/var/named' bind::defaults::logdir: '/var/log/named' bind::defaults::default_zones_include: '/etc/named.default-zones.conf' bind::defaults::default_zones_source: 'puppet:///modules/bind/RedHat/named.default-zones.conf' +bind::defaults::isc_bind_keys: '/etc/named.iscdlv.key' bind::updater::keydir: '/etc/named/keys' diff --git a/manifests/defaults.pp b/manifests/defaults.pp index c315291..0930185 100644 --- a/manifests/defaults.pp +++ b/manifests/defaults.pp @@ -15,6 +15,7 @@ class bind::defaults ( $managed_keys_directory = undef, $default_zones_include = undef, $default_zones_source = undef, + $isc_bind_keys = undef, ) { unless is_bool($supported) { fail('Please ensure that the dependencies of the bind module are installed and working correctly') diff --git a/templates/named.conf.erb b/templates/named.conf.erb index 9632200..65a7d1d 100644 --- a/templates/named.conf.erb +++ b/templates/named.conf.erb @@ -35,6 +35,9 @@ options { <%- if @dnssec -%> dnssec-validation yes; dnssec-lookaside auto; +<%- if @isc_bind_keys -%> + bindkeys-file "<%= @isc_bind_keys %>"; +<%- end -%> <%- end -%> <%- if @version != '' -%> version "<%= @version %>";