From 6c52b5233f4abdaa2ebc5b9eb8cb3d0563618245 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Fri, 29 Aug 2014 11:43:09 +0200
Subject: [PATCH] Move profile `icinga2-dev' and its files to
 `profiles/icinga2-dev'

refs #6842
---
 .../modules/profile/manifests/icinga2-dev.pp  | 28 -------------------
 .../files/etc/icinga2/conf.d/commands.conf    |  0
 .../files/etc/icinga2/conf.d/test-config.conf |  0
 .../files/etc/icinga2/constants.conf          |  0
 .../profiles/icinga2-dev/manifests/init.pp    | 16 +++++++++++
 5 files changed, 16 insertions(+), 28 deletions(-)
 delete mode 100644 .vagrant-puppet/modules/profile/manifests/icinga2-dev.pp
 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%)
 create mode 100644 .vagrant-puppet/profiles/icinga2-dev/manifests/init.pp

diff --git a/.vagrant-puppet/modules/profile/manifests/icinga2-dev.pp b/.vagrant-puppet/modules/profile/manifests/icinga2-dev.pp
deleted file mode 100644
index 5dc3bd08c..000000000
--- a/.vagrant-puppet/modules/profile/manifests/icinga2-dev.pp
+++ /dev/null
@@ -1,28 +0,0 @@
-class profile::icinga2-dev {
-  include icinga2-mysql
-
-  icinga2::feature { [ 'statusdata', 'command', 'compatlog' ]:
-    require => Package['icinga2-classicui-config'],
-  }
-
-  file { '/etc/icinga2/conf.d/test-config.conf':
-    source  => 'puppet:////vagrant/.vagrant-puppet/files/etc/icinga2/conf.d/test-config.conf',
-    owner   => 'icinga',
-    group   => 'icinga',
-    require => [ Package['icinga2'], Exec['create_monitoring_test_config'] ]
-  }
-
-  file { '/etc/icinga2/conf.d/commands.conf':
-    source  => 'puppet:////vagrant/.vagrant-puppet/files/etc/icinga2/conf.d/commands.conf',
-    owner   => 'icinga',
-    group   => 'icinga',
-    require => Package['icinga2'],
-  }
-
-  file { '/etc/icinga2/constants.conf':
-    source  => 'puppet:////vagrant/.vagrant-puppet/files/etc/icinga2/constants.conf',
-    owner   => 'icinga',
-    group   => 'icinga',
-    require => Package['icinga2'],
-  }
-}
diff --git a/.vagrant-puppet/files/etc/icinga2/conf.d/commands.conf b/.vagrant-puppet/profiles/icinga2-dev/files/etc/icinga2/conf.d/commands.conf
similarity index 100%
rename from .vagrant-puppet/files/etc/icinga2/conf.d/commands.conf
rename to .vagrant-puppet/profiles/icinga2-dev/files/etc/icinga2/conf.d/commands.conf
diff --git a/.vagrant-puppet/files/etc/icinga2/conf.d/test-config.conf b/.vagrant-puppet/profiles/icinga2-dev/files/etc/icinga2/conf.d/test-config.conf
similarity index 100%
rename from .vagrant-puppet/files/etc/icinga2/conf.d/test-config.conf
rename to .vagrant-puppet/profiles/icinga2-dev/files/etc/icinga2/conf.d/test-config.conf
diff --git a/.vagrant-puppet/files/etc/icinga2/constants.conf b/.vagrant-puppet/profiles/icinga2-dev/files/etc/icinga2/constants.conf
similarity index 100%
rename from .vagrant-puppet/files/etc/icinga2/constants.conf
rename to .vagrant-puppet/profiles/icinga2-dev/files/etc/icinga2/constants.conf
diff --git a/.vagrant-puppet/profiles/icinga2-dev/manifests/init.pp b/.vagrant-puppet/profiles/icinga2-dev/manifests/init.pp
new file mode 100644
index 000000000..f12757dee
--- /dev/null
+++ b/.vagrant-puppet/profiles/icinga2-dev/manifests/init.pp
@@ -0,0 +1,16 @@
+class icinga2-dev {
+  include icinga2
+  include icinga2-mysql
+
+  define icinga2-config {
+    $path = "/etc/icinga2/${name}.conf"
+    file { $path:
+      source  => "puppet:///modules/icinga2-dev${path}",
+      owner   => 'icinga',
+      group   => 'icinga',
+      require => Class['icinga2'],
+    }
+  }
+
+  icinga2-config { [ 'conf.d/test-config', 'conf.d/commands', 'constants' ]: }
+}