Config Conversion: Check that icinga.cfg is passed via -c option.

diff --git a/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm b/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm
index a1c693c96affc02ea021cfaee411c8714d2028a4..3f2557de01f5525bcd3812f6fe2a9cb4194227ff 100644 (file)
--- a/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm
+++ b/tools/configconvert/Icinga2/ImportIcinga1Cfg.pm
@@ -46,7 +46,7 @@ sub get_key_from_icinga1_main_cfg {
     my @key_arr = ();
 
     if ( !-f $file) {
-        errlog(1, "cfg file $file does not exist!");
+        print "cfg file $file does not exist!";
         return;
     }
 

diff --git a/tools/configconvert/icinga2_convert_v1_v2.pl b/tools/configconvert/icinga2_convert_v1_v2.pl
index ed242d42e6a02e08aa9520a196076fbda258ecff..fa007adcf444c72d8295133609f943ac8d20da57 100755 (executable)
--- a/tools/configconvert/icinga2_convert_v1_v2.pl
+++ b/tools/configconvert/icinga2_convert_v1_v2.pl
@@ -90,7 +90,7 @@ GetOptions(
     "V|version"         => \$opt->{version}
 );
 
-my $icinga1_cfg = "/etc/icinga/icinga.cfg";
+my $icinga1_cfg;
 my $icinga2_cfg = {};
 my $conf_prefix = "./conf";
 my $verbose = 1;
@@ -138,6 +138,11 @@ my $type_cnt;
 
 # TODO import/export files in parallel?
 
+# verify that we have something to read
+if ( !-f $icinga1_cfg) {
+    pod2usage(1);
+}
+
 # the import
 my $icinga1_cfg_obj = Icinga2::ImportIcinga1Cfg::parse_icinga1_objects($icinga1_cfg);
 my $icinga1_cfg_obj_cache = Icinga2::ImportIcinga1Cfg::parse_icinga1_objects_cache($icinga1_cfg);