X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Funbound%2Ftemplates%2Funbound.conf.erb;h=4206f81b2ae3a089c3b869547c29255b47c7ddc0;hb=6680306de7b2f9911a4da12b8484d3431056ea53;hp=4da955ffd25a4e68659167f7e1e570be6a119410;hpb=e05673fceab5b68e33fb5ed4661ede6217fb919e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/unbound/templates/unbound.conf.erb b/modules/unbound/templates/unbound.conf.erb
index 4da955ffd..4206f81b2 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 && not @client_ranges.empty? -%>
+<% if (@is_recursor and (not @client_ranges.empty?)) -%>
 	interface: 0.0.0.0
 	interface: ::0
 
@@ -43,6 +43,22 @@ server:
 	# auto-trust-anchor-file: ""
 	auto-trust-anchor-file: "/var/lib/unbound/root.key"
 	auto-trust-anchor-file: "/var/lib/unbound/debian.org.key"
+<% if not @firewall_blocks_dns %>
+	auto-trust-anchor-file: "/var/lib/unbound/29.172.in-addr.arpa.key"
+<% end -%>
+
+	prefetch: yes
+	prefetch-key: yes
+
+
+<% if not @firewall_blocks_dns %>
+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
+<% end -%>
 
 # recursive: <%= @is_recursor ? "y" : "n" %>
 <% if not @is_recursor -%>
@@ -51,7 +67,5 @@ forward-zone:
 <% @ns.to_a.flatten.each do |nms| -%>
 	forward-addr: <%= nms %>
 <% end -%>
-<% end -%>
-<% if hostname == "zappa" -%>
-edns-buffer-size: 512
+	forward-first: yes
 <% end -%>