From 2ea577f97b962b0b752d4743cfb0542aa0f15608 Mon Sep 17 00:00:00 2001
From: Nate Riffe <inkblot@movealong.org>
Date: Mon, 3 Sep 2012 23:10:29 -0500
Subject: [PATCH] Move default zones into the view when recursion is enabled

---
 templates/named.conf.erb | 3 ---
 templates/view.erb       | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/templates/named.conf.erb b/templates/named.conf.erb
index 18a4e32..c677f4e 100644
--- a/templates/named.conf.erb
+++ b/templates/named.conf.erb
@@ -1,6 +1,3 @@
 # This file is managed by puppet - changes will be lost
 include "<%= confdir %>/acls.conf";
 include "<%= confdir %>/views.conf";
-<%- if scope.lookupvar('osfamily') == 'Debian' -%>
-include "<%= confdir %>/named.conf.default-zones";
-<%- end -%>
diff --git a/templates/view.erb b/templates/view.erb
index c1b7756..9eed27e 100644
--- a/templates/view.erb
+++ b/templates/view.erb
@@ -15,6 +15,11 @@ view "<%= name %>" {
 	};
 <%- end -%>
 	recursion <%= recursion ? 'yes' : 'no' %>;
+<%- if recursion -%>
+<%- if scope.lookupvar('osfamily') == 'Debian' -%>
+include "<%= confdir %>/named.conf.default-zones";
+<%- end -%>
+<%- end -%>
 
 <%- zones.each do |zone| -%>
 	include "<%= confdir %>/zones/${zone}.conf";