X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Funbound%2Ftemplates%2Funbound.conf.erb;h=d909f74c974b8dab45ee15d810318cb36d698b70;hb=87e8c26653128159565d887ecc9172aa65010e1f;hp=07f3ca2a6e963b80b01bb96c3d80a0de74229078;hpb=b605115fde737dc5e82ce6d66e878bd7d5f00d03;p=mirror%2Fdsa-puppet.git

diff --git a/modules/unbound/templates/unbound.conf.erb b/modules/unbound/templates/unbound.conf.erb
index 07f3ca2a6..d909f74c9 100644
--- 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
@@ -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")
 %>