diff --git a/data/osfamily/Debian.yaml b/data/osfamily/Debian.yaml index ca071ab..735d72a 100644 --- a/data/osfamily/Debian.yaml +++ b/data/osfamily/Debian.yaml @@ -5,7 +5,7 @@ bind::params::bind_group: 'bind' bind::params::bind_package: 'bind9' bind::params::bind_service: 'bind9' bind::params::nsupdate_package: 'dnsutils' - +bind::namedconf: '/etc/bind/named.conf' bind::confdir: '/etc/bind' bind::cachedir: '/var/cache/bind' bind::rndc: true diff --git a/data/osfamily/RedHat.yaml b/data/osfamily/RedHat.yaml index 13904fd..fc16e8a 100644 --- a/data/osfamily/RedHat.yaml +++ b/data/osfamily/RedHat.yaml @@ -5,7 +5,7 @@ bind::params::bind_group: 'named' bind::params::bind_package: 'bind' bind::params::bind_service: 'named' bind::params::nsupdate_package: 'bind-utils' - +bind::namedconf: '/etc/named.conf' bind::confdir: '/etc/named' bind::cachedir: '/var/named' bind::rndc: true diff --git a/manifests/init.pp b/manifests/init.pp index 6257df6..d8a2f07 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -2,6 +2,7 @@ class bind ( $confdir = undef, + $namedconf = undef, $cachedir = undef, $forwarders = undef, $dnssec = undef, @@ -9,7 +10,7 @@ class bind ( $rndc = undef, $statistics_port = undef, ) { - include params + include ::bind::params $auth_nxdomain = false @@ -59,7 +60,7 @@ class bind ( recurse => true, } - file { "${confdir}/named.conf": + file { "${namedconf}": content => template('bind/named.conf.erb'), } diff --git a/spec/classes/bind_spec.rb b/spec/classes/bind_spec.rb index 9fada43..20568b7 100644 --- a/spec/classes/bind_spec.rb +++ b/spec/classes/bind_spec.rb @@ -11,8 +11,8 @@ describe 'bind' do }) } - it { should contain_file('_CONFDIR_/named.conf').that_requires('Package[bind]') } - it { should contain_file('_CONFDIR_/named.conf').that_notifies('Service[bind]') } + it { should contain_file('_NAMEDCONF_').that_requires('Package[bind]') } + it { should contain_file('_NAMEDCONF_').that_notifies('Service[bind]') } it { should contain_service('bind').with({ diff --git a/spec/fixtures/hiera/common.yaml b/spec/fixtures/hiera/common.yaml index 631d77d..12f29a7 100644 --- a/spec/fixtures/hiera/common.yaml +++ b/spec/fixtures/hiera/common.yaml @@ -1,2 +1,3 @@ --- bind::confdir: '_CONFDIR_' +bind::namedconf: '_NAMEDCONF_'