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

diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp
index 587b19bb6..667abc11f 100644
--- a/modules/unbound/manifests/init.pp
+++ b/modules/unbound/manifests/init.pp
@@ -9,8 +9,8 @@
 class unbound {
 
 	$is_recursor   = getfromhash($site::nodeinfo, 'misc', 'resolver-recursive')
-	$client_ranges = getfromhash($site::nodeinfo, 'hoster', 'allow_dns_query')
-	$dodgy_ns      = getfromhash($site::nodeinfo, 'hoster', 'nameservers_break_dnssec')
+	$client_ranges = hiera('allow_dns_query')
+	$empty_client_range = empty($client_ranges)
 	$ns            = hiera('nameservers')
 
 	package { 'unbound':
@@ -23,6 +23,11 @@ class unbound {
 		pattern   => 'unbound',
 	}
 
+	file { '/etc/init.d/unbound':
+		source => 'puppet:///modules/unbound/unbound.init',
+		mode   => '0555',
+		notify => Exec['systemctl daemon-reload'],
+	}
 	file { '/var/lib/unbound':
 		ensure  => directory,
 		owner   => unbound,
@@ -46,6 +51,14 @@ class unbound {
 		mode    => '0644',
 		source  => 'puppet:///modules/unbound/debian.org.key'
 	}
+	file { '/var/lib/unbound/29.172.in-addr.arpa.key':
+		ensure  => present,
+		replace => false,
+		owner   => unbound,
+		group   => unbound,
+		mode    => '0644',
+		source  => 'puppet:///modules/unbound/29.172.in-addr.arpa.key'
+	}
 	file { '/etc/unbound/unbound.conf':
 		content => template('unbound/unbound.conf.erb'),
 		require => [
@@ -56,16 +69,16 @@ class unbound {
 		notify  => Service['unbound']
 	}
 
-	if ($is_recursor and $client_ranges) {
+	if ($is_recursor and !$empty_client_range) { 
 		@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))),
 		}
 	}
 }