X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Funbound%2Ftemplates%2Funbound.conf.erb;h=2caa955017f23173fe9e513bd0fba3057175710d;hb=bbaef03179a8a061ba588c934307b1afb541bd50;hp=fe710ea916e09e8774cab7e85c3601d63257ac87;hpb=0e7f3f8bafd5509c7aaee25acdfb9e9753ba16ea;p=mirror%2Fdsa-puppet.git

diff --git a/modules/unbound/templates/unbound.conf.erb b/modules/unbound/templates/unbound.conf.erb
index fe710ea91..2caa95501 100644
--- a/modules/unbound/templates/unbound.conf.erb
+++ b/modules/unbound/templates/unbound.conf.erb
@@ -6,7 +6,7 @@
 server:
 	verbosity: 1
 
-<% if @is_recursor && @client_ranges -%>
+<% if (@is_recursor and (not @client_ranges.empty?)) -%>
 	interface: 0.0.0.0
 	interface: ::0
 
@@ -43,14 +43,26 @@ server:
 	# auto-trust-anchor-file: ""
 	auto-trust-anchor-file: "/var/lib/unbound/root.key"
 	auto-trust-anchor-file: "/var/lib/unbound/debian.org.key"
+	auto-trust-anchor-file: "/var/lib/unbound/29.172.in-addr.arpa.key"
 
-<% if (not @is_recursor) and @ns -%>
+	prefetch: yes
+	prefetch-key: yes
+
+local-zone: "29.172.in-addr.arpa" nodefault
+forward-zone:
+	name: "29.172.in-addr.arpa"
+	forward-host: geo1.debian.org
+	forward-host: geo2.debian.org
+	forward-host: geo3.debian.org
+
+# recursive: <%= @is_recursor ? "y" : "n" %>
+<% if not @is_recursor -%>
 forward-zone:
 	name: "."
 <% @ns.to_a.flatten.each do |nms| -%>
 	forward-addr: <%= nms %>
 <% end -%>
-<% end -%>
-<% if hostname == "zappa" -%>
-edns-buffer-size: 512
+	# 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 -%>