tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed view handling for normal zones in dns::zone.

Browse source
This commit is contained in:
Timo Mkinen 2013-01-08 14:43:49 +02:00
parent 00d5c08f8a
commit 2c7c0c0822
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dns/manifests/init.pp
View file

@ -279,6 +279,11 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
$zone = "$2/$3" $zone = "$2/$3"
$zonefile = "$2-$3" $zonefile = "$2-$3"
} else { } else {
case dirname($name) {
".": { $view = "" }
"default": { $view = "" }
default: { $view = dirname($name) }
}
$zone = basename($name) $zone = basename($name)
$zonefile = $zone $zonefile = $zone
} }
@ -347,7 +352,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
mode => "0750", mode => "0750",
owner => "root", owner => "root",
group => $dns::server::group, group => $dns::server::group,
before => File["${dns::server::chroot}${dns::server::confdir}/${view}zone.${zonefile}"], before => File["${dns::server::chroot}${dns::server::confdir}/${view}/zone.${zonefile}"],
} }
} }
} }
@ -370,7 +375,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
} }
} }
file { "${dns::server::chroot}${dns::server::confdir}/${view}zone.${zonefile}": file { "${dns::server::chroot}${dns::server::confdir}/${view}/zone.${zonefile}":
ensure => present, ensure => present,
content => template("dns/zone.$role.erb"), content => template("dns/zone.$role.erb"),
mode => "0640", mode => "0640",