From ec9c174139e1f1bcd9bf84faaf49c0c0067bba07 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Fri, 12 Sep 2014 18:59:20 +0200
Subject: [PATCH] icingaweb2::config::general: hardcode '/etc/icingaweb' once
 less

refs #6842
---
 .vagrant-puppet/modules/icingaweb2/manifests/config/general.pp  | 2 +-
 .../icingaweb2_dev/files/{etc/icingaweb => }/authentication.ini | 0
 .../icingaweb2_dev/files/{etc/icingaweb => }/config.ini         | 0
 .../files/{etc/icingaweb => }/modules/monitoring/backends.ini   | 0
 .../files/{etc/icingaweb => }/modules/monitoring/config.ini     | 0
 .../files/{etc/icingaweb => }/modules/monitoring/instances.ini  | 0
 .../icingaweb2_dev/files/{etc/icingaweb => }/resources.ini      | 0
 7 files changed, 1 insertion(+), 1 deletion(-)
 rename .vagrant-puppet/profiles/icingaweb2_dev/files/{etc/icingaweb => }/authentication.ini (100%)
 rename .vagrant-puppet/profiles/icingaweb2_dev/files/{etc/icingaweb => }/config.ini (100%)
 rename .vagrant-puppet/profiles/icingaweb2_dev/files/{etc/icingaweb => }/modules/monitoring/backends.ini (100%)
 rename .vagrant-puppet/profiles/icingaweb2_dev/files/{etc/icingaweb => }/modules/monitoring/config.ini (100%)
 rename .vagrant-puppet/profiles/icingaweb2_dev/files/{etc/icingaweb => }/modules/monitoring/instances.ini (100%)
 rename .vagrant-puppet/profiles/icingaweb2_dev/files/{etc/icingaweb => }/resources.ini (100%)

diff --git a/.vagrant-puppet/modules/icingaweb2/manifests/config/general.pp b/.vagrant-puppet/modules/icingaweb2/manifests/config/general.pp
index 0f5f05eec..4d9f79a36 100644
--- a/.vagrant-puppet/modules/icingaweb2/manifests/config/general.pp
+++ b/.vagrant-puppet/modules/icingaweb2/manifests/config/general.pp
@@ -6,7 +6,7 @@ define icingaweb2::config::general ($source, $replace = true) {
   parent_dirs { $path: }
 
   file { $path:
-    source  => "${source}${path}",
+    source  => "${source}/${name}.ini",
     owner   => 'apache',
     group   => 'apache',
     replace => $replace,
diff --git a/.vagrant-puppet/profiles/icingaweb2_dev/files/etc/icingaweb/authentication.ini b/.vagrant-puppet/profiles/icingaweb2_dev/files/authentication.ini
similarity index 100%
rename from .vagrant-puppet/profiles/icingaweb2_dev/files/etc/icingaweb/authentication.ini
rename to .vagrant-puppet/profiles/icingaweb2_dev/files/authentication.ini
diff --git a/.vagrant-puppet/profiles/icingaweb2_dev/files/etc/icingaweb/config.ini b/.vagrant-puppet/profiles/icingaweb2_dev/files/config.ini
similarity index 100%
rename from .vagrant-puppet/profiles/icingaweb2_dev/files/etc/icingaweb/config.ini
rename to .vagrant-puppet/profiles/icingaweb2_dev/files/config.ini
diff --git a/.vagrant-puppet/profiles/icingaweb2_dev/files/etc/icingaweb/modules/monitoring/backends.ini b/.vagrant-puppet/profiles/icingaweb2_dev/files/modules/monitoring/backends.ini
similarity index 100%
rename from .vagrant-puppet/profiles/icingaweb2_dev/files/etc/icingaweb/modules/monitoring/backends.ini
rename to .vagrant-puppet/profiles/icingaweb2_dev/files/modules/monitoring/backends.ini
diff --git a/.vagrant-puppet/profiles/icingaweb2_dev/files/etc/icingaweb/modules/monitoring/config.ini b/.vagrant-puppet/profiles/icingaweb2_dev/files/modules/monitoring/config.ini
similarity index 100%
rename from .vagrant-puppet/profiles/icingaweb2_dev/files/etc/icingaweb/modules/monitoring/config.ini
rename to .vagrant-puppet/profiles/icingaweb2_dev/files/modules/monitoring/config.ini
diff --git a/.vagrant-puppet/profiles/icingaweb2_dev/files/etc/icingaweb/modules/monitoring/instances.ini b/.vagrant-puppet/profiles/icingaweb2_dev/files/modules/monitoring/instances.ini
similarity index 100%
rename from .vagrant-puppet/profiles/icingaweb2_dev/files/etc/icingaweb/modules/monitoring/instances.ini
rename to .vagrant-puppet/profiles/icingaweb2_dev/files/modules/monitoring/instances.ini
diff --git a/.vagrant-puppet/profiles/icingaweb2_dev/files/etc/icingaweb/resources.ini b/.vagrant-puppet/profiles/icingaweb2_dev/files/resources.ini
similarity index 100%
rename from .vagrant-puppet/profiles/icingaweb2_dev/files/etc/icingaweb/resources.ini
rename to .vagrant-puppet/profiles/icingaweb2_dev/files/resources.ini