icinga2::config: hardcode '/etc/icinga2' once less

refs #6842
Icinga · Sep 10, 2014 · e124a42 · e124a42
1 parent a99dbab
commit e124a42
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git 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/...icinga2/features-available/ido-mysql.conf → ...l/files/features-available/ido-mysql.conf b/...icinga2/features-available/ido-mysql.conf → ...l/files/features-available/ido-mysql.conf
diff --git a/...ev/files/etc/icinga2/conf.d/commands.conf → ...es/icinga2_dev/files/conf.d/commands.conf b/...ev/files/etc/icinga2/conf.d/commands.conf → ...es/icinga2_dev/files/conf.d/commands.conf
diff --git a/...files/etc/icinga2/conf.d/test-config.conf → ...icinga2_dev/files/conf.d/test-config.conf b/...files/etc/icinga2/conf.d/test-config.conf → ...icinga2_dev/files/conf.d/test-config.conf
diff --git a/...nga2_dev/files/etc/icinga2/constants.conf → ...profiles/icinga2_dev/files/constants.conf b/...nga2_dev/files/etc/icinga2/constants.conf → ...profiles/icinga2_dev/files/constants.conf