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 5dad163..9276675 100644 (file)
--- 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,24 @@ 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 not @client_ranges -%>
+       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
+       forward-first: yes
 <% end -%>