Merge branch 'master' of git://git.debian.org/mirror/dsa-puppet

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

diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp
index 53a2ae9fbd55ad592420908e89925561c0ff54ac..6c58a7d7b7bdc8c5c778224fe2bdc25210817539 100644 (file)
--- a/modules/unbound/manifests/init.pp
+++ b/modules/unbound/manifests/init.pp
@@ -16,8 +16,6 @@ class unbound {
             group   => unbound,
             mode    => 775,
             ;
-    }
-    file {
         "/var/lib/unbound/root.key":
             ensure  => present,
             replace => false,
@@ -25,10 +23,7 @@ class unbound {
             group   => unbound,
             mode    => 644,
             source  => [ "puppet:///modules/unbound/root.key" ],
-            notify  => Exec["unbound restart"],
             ;
-    }
-    file {
         "/var/lib/unbound/debian.org.key":
             ensure  => present,
             replace => false,
@@ -36,13 +31,10 @@ class unbound {
             group   => unbound,
             mode    => 644,
             source  => [ "puppet:///modules/unbound/debian.org.key" ],
-            notify  => Exec["unbound restart"],
             ;
-    }
-    file {
         "/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,