|
[-]
[+]
|
Changed |
pnp4icinga.changes
|
|
|
|
[-]
[+]
|
Changed |
pnp4icinga.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
pnp4icinga-0.6.13-verify_pnp_config.patch
^
|
| @@ -1,52 +0,0 @@
---- scripts/verify_pnp_config.pl.in.orig 2011-07-17 22:28:03.781937056 +0200
-+++ scripts/verify_pnp_config.pl.in 2011-07-17 22:39:05.464696427 +0200
-@@ -62,10 +62,10 @@
- #
- # 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";
-+$product = lc("icinga");
-+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";
-@@ -75,14 +75,14 @@
- }
- my $prod_name = ucfirst($product);
- my $mode = "";
--my $NagiosCfg = "";
-+my $NagiosCfg = "/etc/icinga/icinga.cfg" if (-f "/etc/icinga/icinga.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;
-@@ -374,7 +374,7 @@
- $err = 0;
- }
- if (! exists $NagiosCfg{"object_cache_file"}) {
-- $NagiosCfg{"object_cache_file"} = "$NagiosBase/var/objects.cache";
-+ $NagiosCfg{"object_cache_file"} = "/var/log/icinga/objects.cache";
- }
- examine ("f;","object_cache_file", $NagiosCfg{"object_cache_file"}) && exit 12;
- info ("useCache","$NagiosCfg{\"object_cache_file\"}");
-@@ -1138,6 +1138,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?
|
|
|
Changed |
pnp4nagios-0.6.19.tar.bz2
^
|
