From 0b1f3183adad93813128a7cab0636533d0e9d98f Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Wed, 10 Sep 2014 18:41:49 +0200
Subject: [PATCH] Make `icingaweb2::config::general' responsible for parent
 directory creation

refs #6842
---
 .../icingaweb2/manifests/config/general.pp        |  3 +++
 .../profiles/icingaweb2_dev/manifests/init.pp     | 15 ---------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/.vagrant-puppet/modules/icingaweb2/manifests/config/general.pp b/.vagrant-puppet/modules/icingaweb2/manifests/config/general.pp
index c54847b9e..0f5f05eec 100644
--- a/.vagrant-puppet/modules/icingaweb2/manifests/config/general.pp
+++ b/.vagrant-puppet/modules/icingaweb2/manifests/config/general.pp
@@ -2,6 +2,9 @@ define icingaweb2::config::general ($source, $replace = true) {
   include apache
 
   $path = "/etc/icingaweb/${name}.ini"
+
+  parent_dirs { $path: }
+
   file { $path:
     source  => "${source}${path}",
     owner   => 'apache',
diff --git a/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp b/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp
index 19150b411..250e38465 100644
--- a/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp
+++ b/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp
@@ -35,21 +35,6 @@ class icingaweb2_dev {
     notify    => Service['apache'],
   }
 
-  $cfgpath = '/etc/icingaweb'
-
-  file { [
-    "${cfgpath}",
-    "${cfgpath}/enabledModules",
-    "${cfgpath}/modules",
-    "${cfgpath}/modules/monitoring",
-    "${cfgpath}/modules/doc"
-  ]:
-    ensure    => 'directory',
-    owner     => 'apache',
-    group     => 'apache',
-    require   => Class['apache'],
-  }
-
   icingaweb2::config::general { 'authentication':
     source  => 'puppet:///modules/icingaweb2_dev',
   }