X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Funbound%2Ftemplates%2Funbound.conf.erb;h=8e06b7df09a2baaeb1adb2d2008785440e0b3f10;hb=1b33f950cfd4289185d8e3470dd0a3168c0782d8;hp=b3c634bb46b851e61d8f98822e47429b3548da9f;hpb=34751cc016e5537200e8ff27914914e35209e77f;p=mirror%2Fdsa-puppet.git diff --git a/modules/unbound/templates/unbound.conf.erb b/modules/unbound/templates/unbound.conf.erb index b3c634bb4..8e06b7df0 100644 --- a/modules/unbound/templates/unbound.conf.erb +++ b/modules/unbound/templates/unbound.conf.erb @@ -45,6 +45,13 @@ 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: geo1.debian.org + forward-host: geo2.debian.org + forward-host: geo3.debian.org + # recursive: <%= @is_recursor ? "y" : "n" %> <% if not @is_recursor -%> forward-zone: @@ -52,14 +59,9 @@ forward-zone: <% @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" - forward-host: ns1.debian.org - forward-host: ns2.debian.org - forward-host: ns3.debian.org - forward-host: ns4.debian.com +<% 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 -%>