From 2c7c0c0822eb39fa6efc4911d74756a8af2e3cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Tue, 8 Jan 2013 14:43:49 +0200
Subject: [PATCH] Fixed view handling for normal zones in dns::zone.

---
 dns/manifests/init.pp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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",