Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

[dsa-puppet.git] / modules / unbound / manifests / init.pp

diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp
index 08f3e4acae76e24eb0acf3aac99c96ad4895cc3a..3a0eeb34ec8bdac2b009f6ca659221decc963466 100644 (file)
--- 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 $client_ranges.empty?) {
+       if ($is_recursor and !$empty_client_range) { 
                @ferm::rule { 'dsa-dns':
                        domain      => 'ip',
                        description => 'Allow nameserver access',