X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Funbound%2Ftemplates%2Funbound.conf.erb;h=d909f74c974b8dab45ee15d810318cb36d698b70;hb=bbaef180737102fdf7926680ff9e937c0f1fd472;hp=2f29ef95f937cd296de09769cd99122f526c0bb3;hpb=1a56d85cf69281c37654c70d0a2fe9ae8ce96f00;p=mirror%2Fdsa-puppet.git

diff --git a/modules/unbound/templates/unbound.conf.erb b/modules/unbound/templates/unbound.conf.erb
index 2f29ef95f..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
@@ -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:'
@@ -62,9 +62,9 @@ server:
 	end
 
 
-	<% if hostname == "zappa" -%>
-	edns-buffer-size: 512
-	<% end -%>
+	if hostname == "zappa"
+		out << "edns-buffer-size: 512"
+	end
 
 	out.join("\n")
 %>