Author: glen Date: Thu Aug 13 15:48:12 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- fix --datadir and --dataroot dir to reflect nagios3 directory layout
- fix path to config file in init script
- add perl-Time-HiRes dependency (process_perfdata.pl needs this)
- LP#413073
---- Files affected:
packages/nagios-pnp:
nagios-pnp.init (1.1 -> 1.2) , nagios-pnp.spec (1.4 -> 1.5)
---- Diffs:
================================================================
Index: packages/nagios-pnp/nagios-pnp.init
diff -u packages/nagios-pnp/nagios-pnp.init:1.1
packages/nagios-pnp/nagios-pnp.init:1.2
--- packages/nagios-pnp/nagios-pnp.init:1.1 Tue Nov 25 15:42:02 2008
+++ packages/nagios-pnp/nagios-pnp.init Thu Aug 13 17:48:06 2009
@@ -35,7 +35,7 @@
# Check if the service is already running?
if [ ! -f /var/lock/subsys/npcd ]; then
msg_starting "Nagios Performancedata Daemon"
- daemon /usr/sbin/npcd -f /etc/pnp4nagios/npcd.cfg -d
+ daemon /usr/sbin/npcd -f /etc/pnp/npcd.cfg -d
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/npcd
else
================================================================
Index: packages/nagios-pnp/nagios-pnp.spec
diff -u packages/nagios-pnp/nagios-pnp.spec:1.4
packages/nagios-pnp/nagios-pnp.spec:1.5
--- packages/nagios-pnp/nagios-pnp.spec:1.4 Mon May 4 14:09:58 2009
+++ packages/nagios-pnp/nagios-pnp.spec Thu Aug 13 17:48:07 2009
@@ -2,7 +2,7 @@
Summary: Nagios performance data analysis tool
Name: nagios-pnp
Version: 0.4.14
-Release: 0.1
+Release: 0.2
License: GPL v2
Group: Applications/System
URL: http://www.pnp4nagios.org/pnp/start
@@ -16,6 +16,7 @@
BuildRequires: sed >= 4.0
Requires(post,preun): /sbin/chkconfig
Requires: nagios
+Requires: perl-Time-HiRes
Requires: php(gd)
Requires: rc-scripts
Requires: rrdtool
@@ -35,8 +36,8 @@
--libexecdir=%{_libdir}/pnp \
--sysconfdir=%{_sysconfdir}/pnp \
--localstatedir=%{_localstatedir}/log/pnp \
- --datadir=%{_datadir}/nagios/html/pnp \
- --datarootdir=%{_datadir}/nagios/html/pnp \
+ --datadir=%{_datadir}/nagios/pnp \
+ --datarootdir=%{_datadir}/nagios/pnp \
--with-perfdata-dir=%{_localstatedir}/lib/pnp \
--with-perfdata-spool-dir=%{_localstatedir}/spool/pnp
@@ -93,7 +94,7 @@
%attr(755,nagios,nagios) %{_localstatedir}/lib/pnp
%attr(755,nagios,nagios) %{_localstatedir}/log/pnp
%attr(755,nagios,nagios) %{_localstatedir}/spool/pnp
-%{_datadir}/nagios/html/pnp
+%{_datadir}/nagios/pnp
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -101,6 +102,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2009/08/13 15:48:07 glen
+- fix --datadir and --dataroot dir to reflect nagios3 directory layout
+- fix path to config file in init script
+- add perl-Time-HiRes dependency (process_perfdata.pl needs this)
+- LP#413073
+
Revision 1.4 2009/05/04 12:09:58 grzegorz
- added BR: perl-Time-HiRes
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-pnp/nagios-pnp.init?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-pnp/nagios-pnp.spec?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
