From 513fbe6461cd5bf8e4f4f9f341ebd098cf35d2d5 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 10 Dec 2014 15:16:19 +0100
Subject: [PATCH] puppet: Let icingaweb2::config::general() use the config path
 defined by hiera

---
 .../icingaweb2/manifests/config/general.pp    | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/.vagrant-puppet/modules/icingaweb2/manifests/config/general.pp b/.vagrant-puppet/modules/icingaweb2/manifests/config/general.pp
index 4e86afbfc..ba958ba80 100644
--- a/.vagrant-puppet/modules/icingaweb2/manifests/config/general.pp
+++ b/.vagrant-puppet/modules/icingaweb2/manifests/config/general.pp
@@ -1,21 +1,15 @@
-define icingaweb2::config::general ($source, $replace = true) {
-  include apache
-  include icingaweb2
+define icingaweb2::config::general (
+  $source,
+  $config   = hiera('icingaweb2::config'),
+  $replace  = true
+) {
+  include icingaweb2::config
 
-  $path = "/etc/icingaweb/${name}.ini"
-
-  parent_dirs { $path:
-    user    => 'apache',
-    require => [
-      Class['apache'],
-      File['icingaweb2cfgDir']
-    ],
-  }
-  -> file { $path:
-    source  => "${source}/${name}.ini",
-    owner   => 'apache',
-    group   => 'apache',
-    replace => $replace,
-    require => Class['apache'],
+  file { "${config}/${name}.ini":
+     source  => "${source}/${name}.ini",
+     owner   => 'root',
+     group   => 'icingaweb',
+     mode    => 0660,
+     replace => $replace,
   }
 }