X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Funbound%2Fmanifests%2Finit.pp;h=f01b7fd74a370a889c2cfacdbc7c5eecb3b4b001;hb=a24bed77913f23c0550f6f5d8287cb6c8ba9f4ed;hp=a89f783386220289ab35affa6808705673c653b6;hpb=ed3381df54de9d6211f1a522d77894dcb2437e94;p=mirror%2Fdsa-puppet.git

diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp
index a89f78338..f01b7fd74 100644
--- a/modules/unbound/manifests/init.pp
+++ b/modules/unbound/manifests/init.pp
@@ -14,10 +14,9 @@ class unbound {
             ensure  => directory,
             owner   => unbound,
             group   => unbound,
+            require => Package["unbound"],
             mode    => 775,
             ;
-    }
-    file {
         "/var/lib/unbound/root.key":
             ensure  => present,
             replace => false,
@@ -25,10 +24,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 +32,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,