cleanup

[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 d97ee7e..d909f74 100644 (file)
--- a/modules/unbound/templates/unbound.conf.erb
+++ b/modules/unbound/templates/unbound.conf.erb
@@ -8,7 +8,7 @@ server:
 
 <%=
        out = []
-       if nodeinfo['misc']['resolver-recursive'] and nodeinfo['hoster']['allow_dns_query']
+       if scope.lookupvar('site::nodeinfo')['misc']['resolver-recursive'] and scope.lookupvar('site::nodeinfo')['hoster']['allow_dns_query']
                out << "        interface: 0.0.0.0"
                out << "        interface: ::0"
                out << ""
@@ -20,7 +20,7 @@ server:
                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|
+               scope.lookupvar('site::nodeinfo')['hoster']['allow_dns_query'].each do |net|
                        out << "        access-control: #{net} allow"
                end
        end
@@ -50,8 +50,8 @@ server:
 
 <%=
        out = []
-       if not nodeinfo['misc']['resolver-recursive'] and not nodeinfo['hoster']['nameservers_break_dnssec']
-               forwarders = nodeinfo['hoster']['nameservers']
+       if not scope.lookupvar('site::nodeinfo')['misc']['resolver-recursive'] and not scope.lookupvar('site::nodeinfo')['hoster']['nameservers_break_dnssec']
+               forwarders = scope.lookupvar('site::nodeinfo')['hoster']['nameservers']
                forwarders ||= []
 
                out << 'forward-zone:'
@@ -60,5 +60,11 @@ server:
                        out << "        forward-addr: #{ns}"
                end
        end
+
+
+       if hostname == "zappa"
+               out << "edns-buffer-size: 512"
+       end
+
        out.join("\n")
 %>