Move default zones into the view when recursion is enabled

This commit is contained in:
Nate Riffe 2012-09-03 23:10:29 -05:00
parent 2d1d6d826d
commit 2ea577f97b
2 changed files with 5 additions and 3 deletions

View File

@ -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 -%>

View File

@ -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";