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 7fca15ee53cc00f11df46396c2532522c5181962..f01b7fd74a370a889c2cfacdbc7c5eecb3b4b001 100644 (file)
--- a/modules/unbound/manifests/init.pp
+++ b/modules/unbound/manifests/init.pp
@@ -14,6 +14,7 @@ class unbound {
             ensure  => directory,
             owner   => unbound,
             group   => unbound,
+            require => Package["unbound"],
             mode    => 775,
             ;
         "/var/lib/unbound/root.key":
@@ -23,7 +24,6 @@ class unbound {
             group   => unbound,
             mode    => 644,
             source  => [ "puppet:///modules/unbound/root.key" ],
-            notify  => Exec["unbound restart"],
             ;
         "/var/lib/unbound/debian.org.key":
             ensure  => present,
@@ -32,11 +32,10 @@ class unbound {
             group   => unbound,
             mode    => 644,
             source  => [ "puppet:///modules/unbound/debian.org.key" ],
-            notify  => Exec["unbound restart"],
             ;
         "/etc/unbound/unbound.conf":
             content => template("unbound/unbound.conf.erb"),
-            require => Package["unbound"],
+            require => [ Package["unbound"], File['/var/lib/unbound/root.key'],  File['/var/lib/unbound/debian.org.key'] ],
             notify  => Exec["unbound restart"],
             owner   => root,
             group   => root,
@@ -51,12 +50,12 @@ class unbound {
                     @ferm::rule { "dsa-dns":
                         domain          => "ip",
                         description     => "Allow nameserver access",
-                        rule            => sprintf("&TCP_UDP_SERVICE_RANGE(53, %s)", join_spc(filter_ipv4(getfromhash($nodeinfo, 'hoster', 'allow_dns_query')))),
+                        rule            => sprintf("&TCP_UDP_SERVICE_RANGE(53, (%s))", join_spc(filter_ipv4(getfromhash($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($nodeinfo, 'hoster', 'allow_dns_query')))),
+                        rule            => sprintf("&TCP_UDP_SERVICE_RANGE(53, (%s))", join_spc(filter_ipv6(getfromhash($nodeinfo, 'hoster', 'allow_dns_query')))),
                     }
                 }
             }