From 260ec95771b3c362df00846a3ce455d00ae3a710 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Wed, 10 Sep 2014 11:21:29 +0200
Subject: [PATCH] Rename `icingaweb2::config' to `icingaweb2::config::general'

refs #6842
---
 .../icingaweb2/manifests/config/{init.pp => general.pp}       | 2 +-
 .vagrant-puppet/modules/icingaweb2/manifests/config/module.pp | 2 +-
 .vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename .vagrant-puppet/modules/icingaweb2/manifests/config/{init.pp => general.pp} (72%)

diff --git a/.vagrant-puppet/modules/icingaweb2/manifests/config/init.pp b/.vagrant-puppet/modules/icingaweb2/manifests/config/general.pp
similarity index 72%
rename from .vagrant-puppet/modules/icingaweb2/manifests/config/init.pp
rename to .vagrant-puppet/modules/icingaweb2/manifests/config/general.pp
index a1f364d06..642f43a26 100644
--- a/.vagrant-puppet/modules/icingaweb2/manifests/config/init.pp
+++ b/.vagrant-puppet/modules/icingaweb2/manifests/config/general.pp
@@ -1,4 +1,4 @@
-define icingaweb2::config ($source, $replace = true) {
+define icingaweb2::config::general ($source, $replace = true) {
   $path = "/etc/icingaweb/${name}.ini"
   file { $path:
     source  => "${source}${path}",
diff --git a/.vagrant-puppet/modules/icingaweb2/manifests/config/module.pp b/.vagrant-puppet/modules/icingaweb2/manifests/config/module.pp
index ece68c025..fe5b6c0cc 100644
--- a/.vagrant-puppet/modules/icingaweb2/manifests/config/module.pp
+++ b/.vagrant-puppet/modules/icingaweb2/manifests/config/module.pp
@@ -1,5 +1,5 @@
 define icingaweb2::config::module ($source, $module = 'monitoring', $replace = true) {
-  icingaweb2::config { "modules/${module}/${name}":
+  icingaweb2::config::general { "modules/${module}/${name}":
     source  => $source,
     replace => $replace,
   }
diff --git a/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp b/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp
index 49088c8b7..fe50fc9c5 100644
--- a/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp
+++ b/.vagrant-puppet/profiles/icingaweb2_dev/manifests/init.pp
@@ -44,11 +44,11 @@ class icingaweb2_dev {
     group     => 'apache',
   }
 
-  icingaweb2::config { 'authentication':
+  icingaweb2::config::general { 'authentication':
     source  => 'puppet:///modules/icingaweb2_dev',
   }
 
-  icingaweb2::config { [ 'resources', 'config' ]:
+  icingaweb2::config::general { [ 'resources', 'config' ]:
     source  => 'puppet:///modules/icingaweb2_dev',
     replace => false,
   }