massive style guide fixups

[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 07f3ca2a6e963b80b01bb96c3d80a0de74229078..c11df43f45cd341315110a9efd951add320f8cc2 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 << ""
@@ -32,8 +32,6 @@ server:
        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
@@ -52,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:'
@@ -62,5 +60,11 @@ server:
                        out << "        forward-addr: #{ns}"
                end
        end
+
+
+       if hostname == "zappa"
+               out << "edns-buffer-size: 512"
+       end
+
        out.join("\n")
 %>