diff --git a/dns/manifests/init.pp b/dns/manifests/init.pp index ecc373d..9142889 100644 --- a/dns/manifests/init.pp +++ b/dns/manifests/init.pp @@ -279,6 +279,11 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [], $zone = "$2/$3" $zonefile = "$2-$3" } else { + case dirname($name) { + ".": { $view = "" } + "default": { $view = "" } + default: { $view = dirname($name) } + } $zone = basename($name) $zonefile = $zone } @@ -347,7 +352,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [], mode => "0750", owner => "root", 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, content => template("dns/zone.$role.erb"), mode => "0640",