[icinga-checkins] icinga.org: icinga2/feature/configconvert-2743: configconvert: drop config file prefix 'icinga2'

git at icinga.org git at icinga.org
Fri May 3 12:55:41 CEST 2013


Module: icinga2
Branch: feature/configconvert-2743
Commit: 1c3ca085740b8bb4e16bea9f961b0c03312f20b3
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=1c3ca085740b8bb4e16bea9f961b0c03312f20b3

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Fri May  3 12:54:48 2013 +0200

configconvert: drop config file prefix 'icinga2'

just makes it hard to work with.

refs #4036

---

 contrib/configconvert/icinga2_convert_v1_v2.pl |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/configconvert/icinga2_convert_v1_v2.pl b/contrib/configconvert/icinga2_convert_v1_v2.pl
index ac28c3c..d292e44 100755
--- a/contrib/configconvert/icinga2_convert_v1_v2.pl
+++ b/contrib/configconvert/icinga2_convert_v1_v2.pl
@@ -112,12 +112,12 @@ if (defined $opt->{version}) { print $version."\n"; exit 0; }
 if ($opt->{help}) { pod2usage(1); }
 
 $icinga2_cfg->{'main'}= "$conf_prefix/icinga2.conf";
-$icinga2_cfg->{'hosts'}= "$conf_prefix/icinga2-hosts.conf";
-$icinga2_cfg->{'services'}= "$conf_prefix/icinga2-services.conf";
-$icinga2_cfg->{'users'}= "$conf_prefix/icinga2-users.conf";
-$icinga2_cfg->{'groups'}= "$conf_prefix/icinga2-groups.conf";
-$icinga2_cfg->{'notifications'}= "$conf_prefix/icinga2-notifications.conf";
-$icinga2_cfg->{'timeperiods'}= "$conf_prefix/icinga2-timeperiods.conf";
+$icinga2_cfg->{'hosts'}= "$conf_prefix/hosts.conf";
+$icinga2_cfg->{'services'}= "$conf_prefix/services.conf";
+$icinga2_cfg->{'users'}= "$conf_prefix/users.conf";
+$icinga2_cfg->{'groups'}= "$conf_prefix/groups.conf";
+$icinga2_cfg->{'notifications'}= "$conf_prefix/notifications.conf";
+$icinga2_cfg->{'timeperiods'}= "$conf_prefix/timeperiods.conf";
 
 $icinga2_cfg->{'itl'}->{'host-template'} = "";
 $icinga2_cfg->{'itl'}->{'service-template'} = "plugin-service";





More information about the icinga-checkins mailing list