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

dns/templates/db.erb

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

dns/templates/zone.slave.erb

@@ -5,6 +5,10 @@ zone "<%= zone %>" {
 <% else -%>
     file "<%= zonedir %>/db.<%= zone %>";
 <% end -%>
-    masters { <%= master %>; };
+    masters { 
+    <%     masters.each_pair do |k, v| -%>
+        <%= v['ip'] %>;
+    <%     end -%>
+    };
     allow-transfer { none; };
 };