Move the ignore of /etc/exim4/email-virtualdomains to ignoreall

[mirror/dsa-puppet.git] / modules / unbound / templates / unbound.conf.erb

diff --git a/modules/unbound/templates/unbound.conf.erb b/modules/unbound/templates/unbound.conf.erb
index 080bf95..4f01603 100644 (file)
--- a/modules/unbound/templates/unbound.conf.erb
+++ b/modules/unbound/templates/unbound.conf.erb
@@ -52,6 +52,12 @@ forward-zone:
 <% @ns.to_a.flatten.each do |nms| -%>
        forward-addr: <%= nms %>
 <% end -%>
+<% if @lsbmajdistrelease >= '7' -%>
+       # This will actually only work starting with unbound 1.4.18 (wheezy has 1.4.17)
+       # previously, forward-first was not implemented for the root zone.
+       forward-first: yes
+<% end -%>
+
 # XXX : we probably ought to forward 172.29 reverse queries to our nameserver
 # if our forwarders are not ours.
 <% else -%>
@@ -63,6 +69,3 @@ forward-zone:
        forward-host: ns3.debian.org
        forward-host: ns4.debian.com
 <% end -%>
-<% if hostname == "zappa" -%>
-edns-buffer-size: 512
-<% end -%>