easydns uses hmac-md5 algorithm

[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 e8e8b581bb4560f408855ccb6fe1e24d3d029fad..e885ec95533159097f1dd3e8d243e41fa1200bb7 100644 (file)
--- a/modules/unbound/templates/unbound.conf.erb
+++ b/modules/unbound/templates/unbound.conf.erb
@@ -43,17 +43,8 @@ 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"
 
-# recursive: <%= @is_recursor ? "y" : "n" %>
-<% if not @is_recursor -%>
-forward-zone:
-       name: "."
-<% @ns.to_a.flatten.each do |nms| -%>
-       forward-addr: <%= nms %>
-<% 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"
@@ -61,7 +52,17 @@ forward-zone:
        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:
+       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 -%>