variable assignment does not clone string...

[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 026126bd0f2740972c4d6d6907a7d0675cbf2982..8e06b7df09a2baaeb1adb2d2008785440e0b3f10 100644 (file)
--- a/modules/unbound/templates/unbound.conf.erb
+++ b/modules/unbound/templates/unbound.conf.erb
@@ -6,34 +6,28 @@
 server:
        verbosity: 1
 
-<%=
-       out = []
-       if nodeinfo['misc']['resolver-recursive'] and nodeinfo['hoster']['allow_dns_query']
-               out << "        interface: 0.0.0.0"
-               out << "        interface: ::0"
-               out << ""
-               out << "        interface-automatic: yes"
+<% if (@is_recursor and (not @client_ranges.empty?)) -%>
+       interface: 0.0.0.0
+       interface: ::0
 
-               out << "        access-control: 0.0.0.0/0 refuse"
-               out << "        access-control: ::0/0 refuse"
-               out << "        access-control: 127.0.0.0/8 allow"
-               out << "        access-control: ::0/0 refuse"
-               out << "        access-control: ::1 allow"
-               out << "        access-control: ::ffff:127.0.0.1 allow"
-               nodeinfo['hoster']['allow_dns_query'].each do |net|
-                       out << "        access-control: #{net} allow"
-               end
-       end
-       out.join("\n")
-%>
+       interface-automatic: yes
+
+       access-control: 0.0.0.0/0 refuse
+       access-control: ::0/0 refuse
+       access-control: 127.0.0.0/8 allow
+       access-control: ::0/0 refuse
+       access-control: ::1 allow
+       access-control: ::ffff:127.0.0.1 allow
+<% @client_ranges.to_a.flatten.each do |net| -%>
+       access-control: <%= net -%> allow
+<% end -%>
+<% end -%>
 
        #chroot: ""
 
        hide-identity: yes
        hide-version: yes
 
-       use-caps-for-id: yes
-
        # Do not query the following addresses. No DNS queries are sent there.
        # List one address per entry. List classless netblocks with /size,
        # do-not-query-address: 127.0.0.1/8
@@ -49,18 +43,25 @@ 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"
 
-<%=
-       out = []
-       unless nodeinfo['misc']['resolver-recursive'] and not nodeinfo['hoster']['nameservers_break_dnssec']
-               forwarders = nodeinfo['hoster']['nameservers']
-               forwarders ||= []
+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
 
-               out << 'forward-zone:'
-               out << '        name: "."'
-               forwarders.each do |ns|
-                       out << "        forward-addr: #{ns}"
-               end
-       end
-       out.join("\n")
-%>
+# 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 -%>
+<% end -%>