X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Funbound%2Fmanifests%2Finit.pp;h=3a0eeb34ec8bdac2b009f6ca659221decc963466;hb=dcf958f2f3e2756c5d1936cdf7a795cd67dd87c7;hp=06395fc9c20c433078496318b4f1dedb1720a414;hpb=04c5cdd5e829b50329ef7bebb51c1f9697de397a;p=mirror%2Fdsa-puppet.git diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp index 06395fc9c..3a0eeb34e 100644 --- a/modules/unbound/manifests/init.pp +++ b/modules/unbound/manifests/init.pp @@ -10,6 +10,7 @@ class unbound { $is_recursor = getfromhash($site::nodeinfo, 'misc', 'resolver-recursive') $client_ranges = hiera('allow_dns_query') + $empty_client_range = empty($client_ranges) $ns = hiera('nameservers') package { 'unbound': @@ -45,6 +46,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 => [ @@ -55,7 +64,7 @@ class unbound { notify => Service['unbound'] } - if ($is_recursor and not empty($client_ranges)) { + if ($is_recursor and !$empty_client_range) { @ferm::rule { 'dsa-dns': domain => 'ip', description => 'Allow nameserver access',