Skip to content

Commit 64aebc5

Browse files
committed
Merge pull request thias#25 from smithtrevor/centos_support
Centos support
2 parents c27b3d5 + 4d4fb12 commit 64aebc5

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

data/osfamily/Debian.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ bind::params::bind_group: 'bind'
55
bind::params::bind_package: 'bind9'
66
bind::params::bind_service: 'bind9'
77
bind::params::nsupdate_package: 'dnsutils'
8-
8+
bind::namedconf: '/etc/bind/named.conf'
99
bind::confdir: '/etc/bind'
1010
bind::cachedir: '/var/cache/bind'
1111
bind::rndc: true

data/osfamily/RedHat.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ bind::params::bind_group: 'named'
55
bind::params::bind_package: 'bind'
66
bind::params::bind_service: 'named'
77
bind::params::nsupdate_package: 'bind-utils'
8-
8+
bind::namedconf: '/etc/named.conf'
99
bind::confdir: '/etc/named'
1010
bind::cachedir: '/var/named'
1111
bind::rndc: true

manifests/init.pp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
class bind (
44
$confdir = undef,
5+
$namedconf = undef,
56
$cachedir = undef,
67
$forwarders = undef,
78
$dnssec = undef,
89
$version = undef,
910
$rndc = undef,
1011
$statistics_port = undef,
1112
) {
12-
include params
13+
include ::bind::params
1314

1415
$auth_nxdomain = false
1516

@@ -59,7 +60,7 @@
5960
recurse => true,
6061
}
6162

62-
file { "${confdir}/named.conf":
63+
file { "${namedconf}":
6364
content => template('bind/named.conf.erb'),
6465
}
6566

spec/classes/bind_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
})
1212
}
1313

14-
it { should contain_file('_CONFDIR_/named.conf').that_requires('Package[bind]') }
15-
it { should contain_file('_CONFDIR_/named.conf').that_notifies('Service[bind]') }
14+
it { should contain_file('_NAMEDCONF_').that_requires('Package[bind]') }
15+
it { should contain_file('_NAMEDCONF_').that_notifies('Service[bind]') }
1616

1717
it {
1818
should contain_service('bind').with({

spec/fixtures/hiera/common.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
---
22
bind::confdir: '_CONFDIR_'
3+
bind::namedconf: '_NAMEDCONF_'

0 commit comments

Comments
 (0)