X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Funbound%2Ftemplates%2Funbound.conf.erb;h=e885ec95533159097f1dd3e8d243e41fa1200bb7;hb=95f18880c7ec083620b8fb1653452ee79578385f;hp=17683a862031792d90df99eacccf35fa0cf57b7f;hpb=9cc83fd1c7a09dd062f510ad4ac4a311b9208dc0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/unbound/templates/unbound.conf.erb b/modules/unbound/templates/unbound.conf.erb
index 17683a862..e885ec955 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,15 +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"
+
+local-zone: "29.172.in-addr.arpa" nodefault
+forward-zone:
+	name: "29.172.in-addr.arpa"
+	forward-host: ns1.debian.org
+	forward-host: ns2.debian.org
+	forward-host: ns3.debian.org
+	forward-host: ns4.debian.com
 
 # recursive: <%= @is_recursor ? "y" : "n" %>
-<% if (not @is_recursor) and (not @ns.empty?) -%>
+<% 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 -%>
-<% if hostname == "zappa" -%>
-edns-buffer-size: 512
 <% end -%>