X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Funbound%2Fmanifests%2Finit.pp;h=caf95027dfdd493f7c1d7292340fea8a80d55e80;hb=0260a86f617032bcaa946081bd36dfb43836047c;hp=5261009bbebed1de7b60d06be5192182ce144d7d;hpb=04ff326f9e84287fa1c944f562a3594a8a5fbbdb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp
index 5261009bb..caf95027d 100644
--- a/modules/unbound/manifests/init.pp
+++ b/modules/unbound/manifests/init.pp
@@ -9,7 +9,7 @@
 class unbound {
 
 	$is_recursor   = getfromhash($site::nodeinfo, 'misc', 'resolver-recursive')
-	$client_ranges = getfromhash($site::nodeinfo, 'hoster', 'allow_dns_query')
+	$client_ranges = hiera('allow_dns_query')
 	$ns            = hiera('nameservers')
 
 	package { 'unbound':
@@ -59,12 +59,12 @@ class unbound {
 		@ferm::rule { 'dsa-dns':
 			domain      => 'ip',
 			description => 'Allow nameserver access',
-			rule        => sprintf('&TCP_UDP_SERVICE_RANGE(53, (%s))', join_spc(filter_ipv4(getfromhash($site::nodeinfo, 'hoster', 'allow_dns_query')))),
+			rule        => sprintf('&TCP_UDP_SERVICE_RANGE(53, (%s))', join_spc(filter_ipv4($client_ranges))),
 		}
 		@ferm::rule { 'dsa-dns6':
 			domain      => 'ip6',
 			description => 'Allow nameserver access',
-			rule        => sprintf('&TCP_UDP_SERVICE_RANGE(53, (%s))', join_spc(filter_ipv6(getfromhash($site::nodeinfo, 'hoster', 'allow_dns_query')))),
+			rule        => sprintf('&TCP_UDP_SERVICE_RANGE(53, (%s))', join_spc(filter_ipv6($client_ranges))),
 		}
 	}
 }