From e124a4254df062339dfa9451e18fc27f2418f4b2 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Wed, 10 Sep 2014 14:38:18 +0200
Subject: [PATCH] icinga2::config: hardcode '/etc/icinga2' once less

refs #6842
---
 .vagrant-puppet/modules/icinga2/manifests/config.pp      | 9 ++++-----
 .../{etc/icinga2 => }/features-available/ido-mysql.conf  | 0
 .../files/{etc/icinga2 => }/conf.d/commands.conf         | 0
 .../files/{etc/icinga2 => }/conf.d/test-config.conf      | 0
 .../icinga2_dev/files/{etc/icinga2 => }/constants.conf   | 0
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename .vagrant-puppet/modules/icinga2_mysql/files/{etc/icinga2 => }/features-available/ido-mysql.conf (100%)
 rename .vagrant-puppet/profiles/icinga2_dev/files/{etc/icinga2 => }/conf.d/commands.conf (100%)
 rename .vagrant-puppet/profiles/icinga2_dev/files/{etc/icinga2 => }/conf.d/test-config.conf (100%)
 rename .vagrant-puppet/profiles/icinga2_dev/files/{etc/icinga2 => }/constants.conf (100%)

diff --git a/.vagrant-puppet/modules/icinga2/manifests/config.pp b/.vagrant-puppet/modules/icinga2/manifests/config.pp
index a512335b0..160a9de63 100644
--- a/.vagrant-puppet/modules/icinga2/manifests/config.pp
+++ b/.vagrant-puppet/modules/icinga2/manifests/config.pp
@@ -17,15 +17,14 @@
 #   }
 #
 #   Provide configuration file '/etc/icinga2/constants.conf'
-#   from 'puppet:///modules/icinga2_dev/etc/icinga2/constants.conf'
-#   ('/path/to/puppet/modules/icinga2_dev/files/etc/icinga2/constants.conf')
+#   from 'puppet:///modules/icinga2_dev/constants.conf'
+#   ('/path/to/puppet/modules/icinga2_dev/files/constants.conf')
 #
 define icinga2::config ($source) {
   include icinga2
 
-  $path = "/etc/icinga2/${name}.conf"
-  file { $path:
-    source  => "${source}${path}",
+  file { "/etc/icinga2/${name}.conf":
+    source  => "${source}/${name}.conf",
     owner   => 'icinga',
     group   => 'icinga',
     require => Class['icinga2'],
diff --git a/.vagrant-puppet/modules/icinga2_mysql/files/etc/icinga2/features-available/ido-mysql.conf b/.vagrant-puppet/modules/icinga2_mysql/files/features-available/ido-mysql.conf
similarity index 100%
rename from .vagrant-puppet/modules/icinga2_mysql/files/etc/icinga2/features-available/ido-mysql.conf
rename to .vagrant-puppet/modules/icinga2_mysql/files/features-available/ido-mysql.conf
diff --git a/.vagrant-puppet/profiles/icinga2_dev/files/etc/icinga2/conf.d/commands.conf b/.vagrant-puppet/profiles/icinga2_dev/files/conf.d/commands.conf
similarity index 100%
rename from .vagrant-puppet/profiles/icinga2_dev/files/etc/icinga2/conf.d/commands.conf
rename to .vagrant-puppet/profiles/icinga2_dev/files/conf.d/commands.conf
diff --git a/.vagrant-puppet/profiles/icinga2_dev/files/etc/icinga2/conf.d/test-config.conf b/.vagrant-puppet/profiles/icinga2_dev/files/conf.d/test-config.conf
similarity index 100%
rename from .vagrant-puppet/profiles/icinga2_dev/files/etc/icinga2/conf.d/test-config.conf
rename to .vagrant-puppet/profiles/icinga2_dev/files/conf.d/test-config.conf
diff --git a/.vagrant-puppet/profiles/icinga2_dev/files/etc/icinga2/constants.conf b/.vagrant-puppet/profiles/icinga2_dev/files/constants.conf
similarity index 100%
rename from .vagrant-puppet/profiles/icinga2_dev/files/etc/icinga2/constants.conf
rename to .vagrant-puppet/profiles/icinga2_dev/files/constants.conf