tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed DNS templates and added support for Ubuntu 12.04 's way of creating resolv.conf.

Browse source
This commit is contained in:
aes_ng 2012-11-05 16:53:31 +02:00 • committed by Ossi Salmi
parent f72325de30
commit b6d34a1cf2
4 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dns/templates/db.erb
View file

@ -14,9 +14,11 @@ $ORIGIN <%= zone %>.
;
@ IN NS <%= v['ns'] %>.
<% end -%>
<% if slaves != [] %>
<% slaves.each_pair do |k, v| -%>
@ IN NS <%= v['ns'] %>.
<% end -%>
<% end -%>
<% if zone.match(/\//) %>
$INCLUDE <%= zonedir %>/db.<%= zone.sub(/\//, '-') %>-dynamic
$INCLUDE <%= zonedir %>/db.<%= zone.sub(/\//, '-') %>-static