X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Funbound%2Fmanifests%2Finit.pp;h=840cfff9b091e08234dd02e5c582a3056c5a5ede;hb=e9b0dc298740c07aff9b54bb93d40c453a9c23b7;hp=bb9e4d82bf3d6c43dabb6dfbe584625c3a5bd673;hpb=ee7d91317ec6efd38f8a281c096c68c48425b64b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp
index bb9e4d82b..840cfff9b 100644
--- a/modules/unbound/manifests/init.pp
+++ b/modules/unbound/manifests/init.pp
@@ -7,11 +7,13 @@
 #   include unbound
 #
 class unbound {
-	$is_recursor   = getfromhash($site::nodeinfo, 'misc', 'resolver-recursive')
+	include stdlib
+
+	$is_recursor   = getfromhash($deprecated::nodeinfo, 'misc', 'resolver-recursive')
 	$client_ranges = hiera('allow_dns_query')
 	$firewall_blocks_dns = hiera('firewall_blocks_dns', false)
 	$empty_client_range = empty($client_ranges)
-	$ns            = hiera('nameservers')
+	$ns            = hiera('resolv::nameservers')
 
 	package { 'unbound':
 		ensure => installed
@@ -55,7 +57,7 @@ class unbound {
 	}
 	file { '/var/lib/unbound/29.172.in-addr.arpa.key':
 		ensure  => $firewall_blocks_dns ? { true  => 'absent', default => 'present' },
-		replace => false,
+		replace => $firewall_blocks_dns ? { true  => true, default => false },
 		owner   => unbound,
 		group   => unbound,
 		mode    => '0644',
@@ -73,12 +75,12 @@ class unbound {
 	}
 
 	if ($is_recursor and !$empty_client_range) { 
-		@ferm::rule { 'dsa-dns':
+		ferm::rule { 'dsa-dns':
 			domain      => 'ip',
 			description => 'Allow nameserver access',
 			rule        => sprintf('&TCP_UDP_SERVICE_RANGE(53, (%s))', join_spc(filter_ipv4($client_ranges))),
 		}
-		@ferm::rule { 'dsa-dns6':
+		ferm::rule { 'dsa-dns6':
 			domain      => 'ip6',
 			description => 'Allow nameserver access',
 			rule        => sprintf('&TCP_UDP_SERVICE_RANGE(53, (%s))', join_spc(filter_ipv6($client_ranges))),