Try to make manifest work with new hieradata

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

diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp
index 9a110df2fd5597eee7f910d729218a59062865de..08f3e4acae76e24eb0acf3aac99c96ad4895cc3a 100644 (file)
--- a/modules/unbound/manifests/init.pp
+++ b/modules/unbound/manifests/init.pp
@@ -1,11 +1,25 @@
+# = Class: unbound
+#
+# This class installs and configures unbound
+#
+# == Sample Usage:
+#
+#   include unbound
+#
 class unbound {
 
+       $is_recursor   = getfromhash($site::nodeinfo, 'misc', 'resolver-recursive')
+       $client_ranges = hiera('allow_dns_query')
+       $ns            = hiera('nameservers')
+
        package { 'unbound':
                ensure => installed
        }
 
        service { 'unbound':
                ensure => running,
+               hasstatus => false,
+               pattern   => 'unbound',
        }
 
        file { '/var/lib/unbound':
@@ -41,18 +55,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 $client_ranges.empty?) {
+               @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))),
                }
        }
 }