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

diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp
index 667abc11f..840cfff9b 100644
--- a/modules/unbound/manifests/init.pp
+++ b/modules/unbound/manifests/init.pp
@@ -7,11 +7,13 @@
 #   include unbound
 #
 class unbound {
+	include stdlib
 
-	$is_recursor   = getfromhash($site::nodeinfo, 'misc', 'resolver-recursive')
+	$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
@@ -41,7 +43,8 @@ class unbound {
 		owner   => unbound,
 		group   => unbound,
 		mode    => '0644',
-		source  => 'puppet:///modules/unbound/root.key'
+		source  => 'puppet:///modules/unbound/root.key',
+		notify  => Service['unbound']
 	}
 	file { '/var/lib/unbound/debian.org.key':
 		ensure  => present,
@@ -49,15 +52,17 @@ class unbound {
 		owner   => unbound,
 		group   => unbound,
 		mode    => '0644',
-		source  => 'puppet:///modules/unbound/debian.org.key'
+		source  => 'puppet:///modules/unbound/debian.org.key',
+		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',
-		source  => 'puppet:///modules/unbound/29.172.in-addr.arpa.key'
+		source  => 'puppet:///modules/unbound/29.172.in-addr.arpa.key',
+		notify  => Service['unbound']
 	}
 	file { '/etc/unbound/unbound.conf':
 		content => template('unbound/unbound.conf.erb'),
@@ -70,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))),