X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Funbound%2Ftemplates%2Funbound.conf.erb;h=e885ec95533159097f1dd3e8d243e41fa1200bb7;hb=de168787833dddc604663b6ee79e7abdaf158737;hp=b3c634bb46b851e61d8f98822e47429b3548da9f;hpb=34751cc016e5537200e8ff27914914e35209e77f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/unbound/templates/unbound.conf.erb b/modules/unbound/templates/unbound.conf.erb
index b3c634bb4..e885ec955 100644
--- a/modules/unbound/templates/unbound.conf.erb
+++ b/modules/unbound/templates/unbound.conf.erb
@@ -45,16 +45,6 @@ server:
 	auto-trust-anchor-file: "/var/lib/unbound/debian.org.key"
 	auto-trust-anchor-file: "/var/lib/unbound/29.172.in-addr.arpa.key"
 
-# recursive: <%= @is_recursor ? "y" : "n" %>
-<% if not @is_recursor -%>
-forward-zone:
-	name: "."
-<% @ns.to_a.flatten.each do |nms| -%>
-	forward-addr: <%= nms %>
-<% end -%>
-# XXX : we probably ought to forward 172.29 reverse queries to our nameserver
-# if our forwarders are not ours.
-<% else -%>
 local-zone: "29.172.in-addr.arpa" nodefault
 forward-zone:
 	name: "29.172.in-addr.arpa"
@@ -62,4 +52,17 @@ forward-zone:
 	forward-host: ns2.debian.org
 	forward-host: ns3.debian.org
 	forward-host: ns4.debian.com
+
+# recursive: <%= @is_recursor ? "y" : "n" %>
+<% if not @is_recursor -%>
+forward-zone:
+	name: "."
+<% @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 -%>
 <% end -%>