icinga2::config: require File[icinga2cfgDir]

refs #6842
2014-09-15 11:39:27 +02:00 · 2014-09-15 11:39:27 +02:00 · 6a2dfb4b17
parent 99f2abe651
commit 6a2dfb4b17
1 changed files with 5 additions and 7 deletions
--- a/.vagrant-puppet/modules/icinga2/manifests/config.pp
+++ b/.vagrant-puppet/modules/icinga2/manifests/config.pp
@ -25,16 +25,14 @@ define icinga2::config ($source) {

  $path = "/etc/icinga2/${name}.conf"

-  parent_dirs { $path: }
-
-  file { $path:
+  parent_dirs { $path:
+    require => File['icinga2cfgDir'],
+  }
+  -> file { $path:
    source  => "${source}/${name}.conf",
    owner   => 'icinga',
    group   => 'icinga',
    notify  => Service['icinga2'],
-    require => [
-      Parent_dirs[$path],
-      User['icinga']
-    ],
+    require => User['icinga'],
  }
 }