puppet: Let icingaweb2::config::general() use the config path defined by hiera

.vagrant-puppet/modules/icingaweb2/manifests/config/general.pp

@@ -1,21 +1,15 @@
-define icingaweb2::config::general ($source, $replace = true) {
+define icingaweb2::config::general (
-  include apache
+  $source,
-  include icingaweb2
+  $config   = hiera('icingaweb2::config'),
+  $replace  = true
+) {
+  include icingaweb2::config
 
-  $path = "/etc/icingaweb/${name}.ini"
+  file { "${config}/${name}.ini":
-
+     source  => "${source}/${name}.ini",
-  parent_dirs { $path:
+     owner   => 'root',
-    user    => 'apache',
+     group   => 'icingaweb',
-    require => [
+     mode    => 0660,
-      Class['apache'],
+     replace => $replace,
-      File['icingaweb2cfgDir']
-    ],
-  }
-  -> file { $path:
-    source  => "${source}/${name}.ini",
-    owner   => 'apache',
-    group   => 'apache',
-    replace => $replace,
-    require => Class['apache'],
   }
 }