Author: glen Date: Mon Dec 21 12:42:44 2009 GMT Module: packages Tag: HEAD ---- Log message: - unify plugin config name - allow passing extra args with plugin; rel 8
---- Files affected: packages/nagios-nrpe: nagios-nrpe.spec (1.47 -> 1.48) ---- Diffs: ================================================================ Index: packages/nagios-nrpe/nagios-nrpe.spec diff -u packages/nagios-nrpe/nagios-nrpe.spec:1.47 packages/nagios-nrpe/nagios-nrpe.spec:1.48 --- packages/nagios-nrpe/nagios-nrpe.spec:1.47 Tue Nov 3 05:51:20 2009 +++ packages/nagios-nrpe/nagios-nrpe.spec Mon Dec 21 13:42:38 2009 @@ -3,7 +3,7 @@ Summary(pl.UTF-8): Demon i wtyczka zdalnego wywoływania wtyczek Nagios Name: nagios-nrpe Version: 2.12 -Release: 7 +Release: 8 License: GPL v2 Group: Networking Source0: http://dl.sourceforge.net/nagios/nrpe-%{version}.tar.gz @@ -89,7 +89,7 @@ $RPM_BUILD_ROOT{%{_localstatedir},/var/run/nrpe} install sample-config/nrpe.cfg $RPM_BUILD_ROOT%{_sysconfdir}/nrpe.cfg -sed -e 's,@plugindir@,%{_plugindir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/plugins/nrpe.cfg +sed -e 's,@plugindir@,%{_plugindir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/plugins/check_nrpe.cfg install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/nrpe install src/nrpe $RPM_BUILD_ROOT%{_sbindir} install src/check_nrpe $RPM_BUILD_ROOT%{_plugindir} @@ -110,6 +110,13 @@ %triggerpostun -- %{name} < 2.6-1.1 %{__sed} -i -e 's,/var/run/nrpe.pid,/var/run/nrpe/nrpe.pid,' %{_sysconfdir}/nrpe.cfg +%triggerpostun -n nagios-plugin-check_nrpe -- nagios-plugin-check_nrpe < 2.12-7.1 +if [ -f %{_sysconfdir}/plugins/nrpe.cfg.rpmsave ]; then + cp -f %{_sysconfdir}/plugins/check_nrpe.cfg{,.rpmnew} + mv -f %{_sysconfdir}/plugins/{nrpe.cfg.rpmsave,check_nrpe.cfg} + sed -i -e 's,-c \$ARG1\$,$ARG1$,' %{_sysconfdir}/plugins/check_nrpe.cfg +fi + %files %defattr(644,root,root,755) %doc Changelog LEGAL README* SECURITY @@ -120,7 +127,7 @@ %files -n nagios-plugin-check_nrpe %defattr(644,root,root,755) -%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugins/nrpe.cfg +%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugins/check_nrpe.cfg %attr(755,root,root) %{_plugindir}/check_nrpe %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -129,6 +136,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.48 2009/12/21 12:42:38 glen +- unify plugin config name +- allow passing extra args with plugin; rel 8 + Revision 1.47 2009/11/03 04:51:20 glen - release 7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-nrpe/nagios-nrpe.spec?r1=1.47&r2=1.48&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
