X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Funbound%2Fmanifests%2Finit.pp;h=ec37dfa8fdcdfd274945a8cdcd4d2499307eec37;hb=946a95b2879d19c72c8b78f5fce685f91d01ecbb;hp=88267d152cb629af29155dacbb9e26ed1692f1fd;hpb=2d15b9008f311fe6443ee665f2fa6ef92b038487;p=mirror%2Fdsa-puppet.git

diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp
index 88267d152..ec37dfa8f 100644
--- a/modules/unbound/manifests/init.pp
+++ b/modules/unbound/manifests/init.pp
@@ -7,9 +7,11 @@
 #   include unbound
 #
 class unbound {
+	include stdlib
 
 	$is_recursor   = getfromhash($site::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')
 
@@ -54,8 +56,8 @@ class unbound {
 		notify  => Service['unbound']
 	}
 	file { '/var/lib/unbound/29.172.in-addr.arpa.key':
-		ensure  => present,
-		replace => false,
+		ensure  => $firewall_blocks_dns ? { true  => 'absent', default => 'present' },
+		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))),