X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Funbound%2Ftemplates%2Funbound.conf.erb;fp=modules%2Funbound%2Ftemplates%2Funbound.conf.erb;h=e885ec95533159097f1dd3e8d243e41fa1200bb7;hb=c41c1433b9dd0394c6b186d93d4c9ce92555f9f4;hp=4f0160303bf8dcc044786b9083b1f843f7e0be42;hpb=694044c1b313f83cb80eee9d9918f5df85a5ab2a;p=dsa-puppet.git

diff --git a/modules/unbound/templates/unbound.conf.erb b/modules/unbound/templates/unbound.conf.erb
index 4f016030..e885ec95 100644
--- a/modules/unbound/templates/unbound.conf.erb
+++ b/modules/unbound/templates/unbound.conf.erb
@@ -45,6 +45,14 @@ server:
 	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 -%>
 forward-zone:
@@ -57,15 +65,4 @@ forward-zone:
 	# 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 -%>
-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
 <% end -%>