Try this

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

diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp
index f94d4739eca76ad3f0d8a6c3634c9b5e4f5f09fe..aa63a5d6c566ea746361fa3b2d269603e399e02e 100644 (file)
--- a/modules/unbound/manifests/init.pp
+++ b/modules/unbound/manifests/init.pp
@@ -8,6 +8,11 @@
 #
 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':
                ensure => installed
        }
@@ -51,18 +56,16 @@ class unbound {
                notify  => Service['unbound']
        }
 
-       if getfromhash($site::nodeinfo, 'misc', 'resolver-recursive') {
-               if getfromhash($site::nodeinfo, 'hoster', 'allow_dns_query') {
-                       @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')))),
-                       }
-                       @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')))),
-                       }
+       if ($is_recursor and not $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($client_ranges))),
+               }
+               @ferm::rule { 'dsa-dns6':
+                       domain      => 'ip6',
+                       description => 'Allow nameserver access',
+                       rule        => sprintf('&TCP_UDP_SERVICE_RANGE(53, (%s))', join_spc(filter_ipv6($client_ranges))),
                }
        }
 }