Skip to content

Commit 37a2ad3

Browse files
committed
bind::server: add param to change the path of named-checkzone
1 parent f742361 commit 37a2ad3

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

manifests/init.pp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
# }
1717
#
1818
class bind (
19-
$chroot = false,
20-
$service_reload = true,
21-
$servicename = $::bind::params::servicename,
22-
$packagenameprefix = $::bind::params::packagenameprefix,
23-
$binduser = $::bind::params::binduser,
24-
$bindgroup = $::bind::params::bindgroup,
19+
$chroot = false,
20+
$service_reload = true,
21+
$servicename = $::bind::params::servicename,
22+
$packagenameprefix = $::bind::params::packagenameprefix,
23+
$binduser = $::bind::params::binduser,
24+
$bindgroup = $::bind::params::bindgroup,
25+
$named_checkzone_path = '/usr/sbin/named-checkzone',
2526
) inherits ::bind::params {
2627

2728
# Chroot differences

manifests/server.pp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
# For backwards compatibility. Use the main bind class instead.
44
#
55
class bind::server (
6-
$chroot = false,
7-
$packagenameprefix = $::bind::params::packagenameprefix,
6+
$chroot = false,
7+
$packagenameprefix = $::bind::params::packagenameprefix,
88
) inherits ::bind::params {
9-
10-
class { '::bind':
9+
class { 'bind':
1110
chroot => $chroot,
1211
packagenameprefix => $packagenameprefix,
1312
}
14-
1513
}

manifests/server/file.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
source => $zone_source,
7979
content => $content,
8080
replace => $replace,
81-
validate_cmd => "/usr/sbin/named-checkzone -k fail -m fail -M fail -n fail -r fail -S fail -T warn -W warn ${zonename} %",
81+
validate_cmd => "${bind::named_checkzone_path} -k fail -m fail -M fail -n fail -r fail -S fail -T warn -W warn ${zonename} %",
8282
notify => Class['::bind::service'],
8383
# For the parent directory
8484
require => [

0 commit comments

Comments
 (0)