[icinga-checkins] icinga.org: puppet-icinga2/develop: Fix the target_file_dir parameters so they' re consistent with the other object defined types.

git at icinga.org git at icinga.org
Sat Nov 22 06:24:11 CET 2014


Module: puppet-icinga2
Branch: develop
Commit: 13e1100d0c3952d2f3a858ce0fd311145efe1a0c
URL:    https://git.icinga.org/?p=puppet-icinga2.git;a=commit;h=13e1100d0c3952d2f3a858ce0fd311145efe1a0c

Author: Nick Chappell <nick at intronic.org>
Date:   Fri Nov 21 21:24:05 2014 -0800

Fix the target_file_dir parameters so they're consistent with the other object defined types.

---

 manifests/object/host.pp         |    2 +-
 manifests/object/hostgroup.pp    |    2 +-
 manifests/object/servicegroup.pp |    2 +-
 manifests/object/sysloglogger.pp |    2 +-
 manifests/object/user.pp         |    2 +-
 manifests/object/usergroup.pp    |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifests/object/host.pp b/manifests/object/host.pp
index 123e360..a3094e9 100644
--- a/manifests/object/host.pp
+++ b/manifests/object/host.pp
@@ -37,7 +37,7 @@ define icinga2::object::host (
   $action_url = undef,
   $icon_image = undef,
   $icon_image_alt = undef,
-  $target_dir = '/etc/icinga2/conf.d',
+  $target_dir = '/etc/icinga2/objects',
   $target_file_name = "${fqdn}.conf",
   $target_file_ensure = file,
   $target_file_owner = 'root',
diff --git a/manifests/object/hostgroup.pp b/manifests/object/hostgroup.pp
index 95937b4..2ded337 100644
--- a/manifests/object/hostgroup.pp
+++ b/manifests/object/hostgroup.pp
@@ -14,7 +14,7 @@ define icinga2::object::hostgroup (
   $display_name = $name,
   $template_to_import = undef,
   $groups = [],
-  $target_dir = '/etc/icinga2/conf.d',
+  $target_dir = '/etc/icinga2/objects',
   $target_file_name = "${name}.conf",
   $target_file_ensure = file,
   $target_file_owner = 'root',
diff --git a/manifests/object/servicegroup.pp b/manifests/object/servicegroup.pp
index 67c8538..2b9b260 100644
--- a/manifests/object/servicegroup.pp
+++ b/manifests/object/servicegroup.pp
@@ -14,7 +14,7 @@ define icinga2::object::servicegroup (
   $display_name = $name,
   $template_to_import = undef,
   $groups = [],
-  $target_dir = '/etc/icinga2/conf.d',
+  $target_dir = '/etc/icinga2/objects',
   $target_file_name = "${name}.conf",
    $target_file_ensure = file,
   $target_file_owner = 'root',
diff --git a/manifests/object/sysloglogger.pp b/manifests/object/sysloglogger.pp
index c33c682..7ad8f02 100644
--- a/manifests/object/sysloglogger.pp
+++ b/manifests/object/sysloglogger.pp
@@ -12,7 +12,7 @@
 define icinga2::object::sysloglogger (
   $object_name = $name,
   $severity = 'warning',
-  $target_dir = '/etc/icinga2/conf.d',
+  $target_dir = '/etc/icinga2/objects',
   $target_file_name = "${name}.conf",
   $target_file_ensure = file,
   $target_file_owner = 'root',
diff --git a/manifests/object/user.pp b/manifests/object/user.pp
index 327ea0b..bb6f0ac 100644
--- a/manifests/object/user.pp
+++ b/manifests/object/user.pp
@@ -20,7 +20,7 @@ define icinga2::object::user (
   $period = undef,
   $types = [],
   $states = [],
-  $target_dir = '/etc/icinga2/conf.d',
+  $target_dir = '/etc/icinga2/objects',
   $target_file_name = "${name}.conf",
   $target_file_ensure = file, 
   $target_file_owner = 'root',
diff --git a/manifests/object/usergroup.pp b/manifests/object/usergroup.pp
index 3c58096..9137450 100644
--- a/manifests/object/usergroup.pp
+++ b/manifests/object/usergroup.pp
@@ -14,7 +14,7 @@ define icinga2::object::usergroup (
   $display_name = $name,
   $template_to_import = undef,
   $groups = [],
-  $target_dir = '/etc/icinga2/conf.d',
+  $target_dir = '/etc/icinga2/objects',
   $target_file_name = "${name}.conf",
   $target_file_ensure = file,
   $target_file_owner = 'root',



More information about the icinga-checkins mailing list