File pnp4icinga-0.6.1-check_pnp_rrds.patch of Package pnp4icinga

File pnp4icinga-0.6.1-check_pnp_rrds.patch of Package pnp4icinga (Revision 1345e24be0c4ceefd44bced09d9e8077)

Currently displaying revision 1345e24be0c4ceefd44bced09d9e8077, show latest

Index: scripts/check_pnp_rrds.pl.in
===================================================================
--- scripts/check_pnp_rrds.pl.in.orig
+++ scripts/check_pnp_rrds.pl.in
@@ -30,7 +30,7 @@
 my $opt_c    = 10;
 my $opt_t    = 10;
 my $opt_p    = "@PERFDATA_DIR@";
-my $opt_ncmd = "/usr/local/nagios/var/rw/nagios.cmd";
+my $opt_ncmd = "/var/log/icinga/rw/icinga.cmd";
 my $opt_phost = "";
 my $opt_pservice = "";
 my $VERSION  = "@PKG_VERSION@";
Index: scripts/verify_pnp_config.pl.in
===================================================================
--- scripts/verify_pnp_config.pl.in.orig
+++ scripts/verify_pnp_config.pl.in
@@ -178,9 +178,9 @@
 		chk_pkg ("nagios",0,1);
 		chk_pkg ("icinga",0,1);
 		chk_pkg ("pnp4nagios",0,1);
-		chk_pkg ("mod-php5,mod_php5",1,0);
+		chk_pkg ("apache2-mod_php5",0,1);
 		chk_pkg ("php,php5,php5-common",1,1);
-		chk_pkg ("dejavu",1,0);
+		chk_pkg ("dejavu",0,1);
 		if ($crit) {
 			info ("LinkReqSW");
 			exit 30;
@@ -218,14 +218,14 @@
 }
 info ("useCfg","$NagiosCfg");
 if (! defined($NagiosBin)) {
-	if (-f "$NagiosBase/bin/$product") {
-		$NagiosBin = "$NagiosBase/bin/$product";
+	if (-f "$NagiosBase/sbin/$product") {
+		$NagiosBin = "$NagiosBase/sbin/$product";
 	} else {
 		info ("noBinary", "$product") && exit 6;
 	}
 }
 if ($NagiosBin !~ /^\//) {
-	$NagiosBin = "$NagiosBase/bin/$NagiosBin";
+	$NagiosBin = "$NagiosBase/sbin/$NagiosBin";
 }
 examine ("x;", "${prod_name}-Binary", "$NagiosBin") && exit 6;
 info ("useBinary","$NagiosBin");
@@ -1027,6 +1027,9 @@
 		if (-f "$PNPdir/etc/npcd.cfg") {
 			$NPCDcfg = "$PNPdir/etc/npcd.cfg";
 		}
+		if (-f "/etc/icinga/pnp/npcd.cfg") {
+            $NPCDcfg = "/etc/icinga/pnp/npcd.cfg";
+		}
 	}
 
 # config file name set?