unkinben/puppet-bind
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move default zones into the view when recursion is enabled

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates/named.conf.erb
View File

@ -1,6 +1,3 @@
# This file is managed by puppet - changes will be lost # This file is managed by puppet - changes will be lost
include "<%= confdir %>/acls.conf"; include "<%= confdir %>/acls.conf";
include "<%= confdir %>/views.conf"; include "<%= confdir %>/views.conf";
<%- if scope.lookupvar('osfamily') == 'Debian' -%>
include "<%= confdir %>/named.conf.default-zones";
<%- end -%>

5
templates/view.erb
View File

@ -15,6 +15,11 @@ view "<%= name %>" {
}; };
<%- end -%> <%- end -%>
recursion <%= recursion ? 'yes' : 'no' %>; recursion <%= recursion ? 'yes' : 'no' %>;
<%- if recursion -%>
<%- if scope.lookupvar('osfamily') == 'Debian' -%>
include "<%= confdir %>/named.conf.default-zones";
<%- end -%>
<%- end -%>
<%- zones.each do |zone| -%> <%- zones.each do |zone| -%>
include "<%= confdir %>/zones/${zone}.conf"; include "<%= confdir %>/zones/${zone}.conf";