Try to avoid reserved site keyword

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

diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp
index 79f172a..840cfff 100644 (file)
--- a/modules/unbound/manifests/init.pp
+++ b/modules/unbound/manifests/init.pp
@@ -9,11 +9,11 @@
 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
@@ -57,7 +57,7 @@ class unbound {
        }
        file { '/var/lib/unbound/29.172.in-addr.arpa.key':
                ensure  => $firewall_blocks_dns ? { true  => 'absent', default => 'present' },
-               replace => false,
+               replace => $firewall_blocks_dns ? { true  => true, default => false },
                owner   => unbound,
                group   => unbound,
                mode    => '0644',
@@ -75,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))),