Remove wheezy-supporting cruft

[mirror/dsa-puppet.git] / modules / unbound / templates / unbound.conf.erb

diff --git a/modules/unbound/templates/unbound.conf.erb b/modules/unbound/templates/unbound.conf.erb
index e885ec9..9276675 100644 (file)
--- a/modules/unbound/templates/unbound.conf.erb
+++ b/modules/unbound/templates/unbound.conf.erb
@@ -45,13 +45,15 @@ server:
        auto-trust-anchor-file: "/var/lib/unbound/debian.org.key"
        auto-trust-anchor-file: "/var/lib/unbound/29.172.in-addr.arpa.key"
 
+       prefetch: yes
+       prefetch-key: yes
+
 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
+       forward-host: geo1.debian.org
+       forward-host: geo2.debian.org
+       forward-host: geo3.debian.org
 
 # recursive: <%= @is_recursor ? "y" : "n" %>
 <% if not @is_recursor -%>
@@ -60,9 +62,5 @@ forward-zone:
 <% @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 -%>