| @@ -0,0 +1,42 @@
+Index: scripts/verify_pnp_config.pl.in
+===================================================================
+--- scripts/verify_pnp_config.pl.in.orig
++++ scripts/verify_pnp_config.pl.in
+@@ -46,9 +46,9 @@
+ # please remove the hash sign (#) on the following line if you're using Icinga
+ # or specify "-M icinga"
+ # $product = lc("icinga");
+-my $basedir = "/usr/local/nagios";
++my $basedir = "/usr";
+ my $NagiosBase = "";
+-my $NagiosBin = "$product" if (-f "$basedir/bin/$product");
++my $NagiosBin = "$product" if (-f "$basedir/sbin/$product");
+ if (! defined $NagiosBin) {
+ if (-d "/usr/local/icinga") {;
+ $basedir = "/usr/local/icinga";
+@@ -58,14 +58,14 @@
+ }
+ my $prod_name = ucfirst($product);
+ my $mode = "";
+-my $NagiosCfg = "";
++my $NagiosCfg = "/etc/nagios/nagios.cfg" if (-f "/etc/nagios/nagios.cfg");
+ my %NagiosCfg = ();
+ my $rrdtool = '@RRDTOOL@';
+ $rrdtool = "/usr/bin/rrdtool" unless ((-f "$rrdtool") and (-x "$rrdtool"));
+ my $PreCheck = 0;
+ my $LogFile = ""; # PNP config.log
+ my %LogFile = ();
+-my $PNPdir = "/usr/local/pnp4nagios"; # PNP root directory
++my $PNPdir = "/usr/share/pnp"; # PNP root directory
+ my $NPCDcfg = ""; # NPCD.cfg
+ my %NPCDcfg = ();
+ my $PPcfg = ""; # process_perfdata.cfg;
+@@ -333,7 +333,7 @@
+ $err = 0;
+ }
+ if (! exists $NagiosCfg{"object_cache_file"}) {
+- $NagiosCfg{"object_cache_file"} = "$NagiosBase/var/objects.cache";
++ $NagiosCfg{"object_cache_file"} = "/var/lib/nagios/objects.cache";
+ }
+ examine ("f;","object_cache_file", $NagiosCfg{"object_cache_file"}) && exit 12;
+ info ("useCache","$NagiosCfg{\"object_cache_file\"}");
|
