Changes - j0ke.net Open Build Service

Changes of Revision 5

[-] [+]	Changed	pnp4icinga.spec
@@ -9,7 +9,7 @@ Name: pnp4icinga %define realname pnp4nagios Summary: Tool for producing graphs from Nagios perfdata -Version: 0.6.1 +Version: 0.6.13 Release: 1 Url: http://www.ederdrom.de/pnp/start License: GPL v2 or later @@ -47,8 +47,8 @@ Source4: pnp4icinga-rpmlintrc Source5: pnp4icinga-nagios-pnp.cfg Source6: pnp4icinga-check_nrpe.cfg -Patch1: pnp4icinga-0.6.1-check_pnp_rrds.patch -Patch2: pnp4icinga-0.6.1-verify_pnp_config.patch +Patch1: pnp4icinga-0.6.13-check_pnp_rrds.patch +Patch2: pnp4icinga-0.6.13-verify_pnp_config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nsusr icinga %define nsgrp icinga @@ -74,6 +74,7 @@ %build %configure \ + --mandir=%{_mandir} \ --datadir=%_datadir/pnp \ --datarootdir=%_datadir/pnp/html \ --localstatedir=/var/log/icinga/pnp \ @@ -104,9 +105,9 @@ -e 's@/usr/var/perfspool/@%{perfdata_spooldir}@' \ -e 's@/usr/local/nagios/libexec/process_perfdata.pl@%libexecdir/process_perfdata.pl@' \ -e 's@/usr/libexec@%libexecdir@' \ - %buildroot/%_sysconfdir/icinga/pnp/npcd.cfg-sample > %buildroot/%_sysconfdir/icinga/pnp/npcd.cfg -mv %buildroot/%_sysconfdir/icinga/pnp/process_perfdata.cfg-sample %buildroot/%_sysconfdir/icinga/pnp/process_perfdata.cfg -mv %buildroot/%_sysconfdir/icinga/pnp/rra.cfg-sample %buildroot/%_sysconfdir/icinga/pnp/rra.cfg + %buildroot/%_defaultdocdir/%name/sample-config/npcd.cfg-sample > %buildroot/%_sysconfdir/icinga/pnp/npcd.cfg +cp %buildroot/%_defaultdocdir/%name/sample-config/process_perfdata.cfg-sample %buildroot/%_sysconfdir/icinga/pnp/process_perfdata.cfg +cp %buildroot/%_defaultdocdir/%name/sample-config/rra.cfg-sample %buildroot/%_sysconfdir/icinga/pnp/rra.cfg sed -e 's@\^hna0@localhost@' \ -e 's@\^traffic@traffic@' \ %buildroot/%_sysconfdir/icinga/pnp/pages/web_traffic.cfg-sample > %buildroot/%_sysconfdir/icinga/pnp/pages/web_traffic.cfg @@ -138,6 +139,10 @@ install -m0755 %{SOURCE3} %buildroot/%_sysconfdir/init.d/npcd mkdir -p %buildroot/%_sbindir ln -s %_sysconfdir/init.d/npcd %buildroot/%_sbindir/rcnpcd +mkdir -p %{buildroot}%{_mandir} +mv %{buildroot}%{_prefix}/man/man8 %{buildroot}%{_mandir}/ +rmdir %{buildroot}%{_prefix}/man +chmod -x %{buildroot}%{_mandir}/man8/* # save discspace, create links %if 0%{suse_version} > 1020 %fdupes -s %buildroot/%_datadir/pnp @@ -157,6 +162,8 @@ %doc %_defaultdocdir/%name/ %dir %_datadir/pnp %dir %_sysconfdir/icinga/pnp +%{_libdir}/npcdmod.o +%{_mandir}/man8/npcd.8* %attr(-,%nsusr,%nsgrp) %dir %{perfdata_spooldir} %attr(-,%nsusr,%nsgrp) %dir /var/log/icinga/pnp %attr(-,%nsusr,%nsgrp) %dir /var/log/icinga/pnp/stats @@ -175,6 +182,6 @@ %config(noreplace) %_sysconfdir/icinga/icinga-pnp.cfg %defattr(775,wwwrun,www) %_datadir/pnp/application/cache -%_datadir/pnp/application/logs +#%_datadir/pnp/application/logs %changelog
[-] [+]	Deleted	pnp4icinga-0.6.1-check_pnp_rrds.patch ^
@@ -1,57 +0,0 @@ -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?
[-] [+]	Deleted	pnp4icinga-0.6.1-verify_pnp_config.patch ^
@@ -1,42 +0,0 @@ -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/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; -@@ -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/log/icinga/objects.cache"; - } - examine ("f;","object_cache_file", $NagiosCfg{"object_cache_file"}) && exit 12; - info ("useCache","$NagiosCfg{\"object_cache_file\"}");
[-] [+]	Added	pnp4icinga-0.6.13-check_pnp_rrds.patch ^
@@ -0,0 +1,11 @@ +--- scripts/check_pnp_rrds.pl.in.orig 2011-05-19 11:23:32.000000000 +0200 ++++ scripts/check_pnp_rrds.pl.in 2011-07-17 22:28:03.781937056 +0200 +@@ -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 $opt_ignore;
[-] [+]	Added	pnp4icinga-0.6.13-verify_pnp_config.patch ^
@@ -0,0 +1,52 @@ +--- 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.13.tar.bz2 ^