Author: glen Date: Mon Aug 3 17:41:30 2009 GMT Module: packages Tag: HEAD ---- Log message: - default configs for each plugin; rel 11
---- Files affected: packages/nagios-plugins: nagios-plugins.spec (1.103 -> 1.104) ---- Diffs: ================================================================ Index: packages/nagios-plugins/nagios-plugins.spec diff -u packages/nagios-plugins/nagios-plugins.spec:1.103 packages/nagios-plugins/nagios-plugins.spec:1.104 --- packages/nagios-plugins/nagios-plugins.spec:1.103 Sat Jul 18 11:36:36 2009 +++ packages/nagios-plugins/nagios-plugins.spec Mon Aug 3 19:41:25 2009 @@ -10,12 +10,14 @@ Summary(pl.UTF-8): Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa Name: nagios-plugins Version: 1.4.13 -Release: 10 +Release: 11 License: GPL v2 Group: Networking Source0: http://dl.sourceforge.net/nagiosplug/%{name}-%{version}.tar.gz # Source0-md5: be6cc7699fff3ee29d1fd4d562377386 -Source1: nagios-utils.php +Source1: %{name}-config-20090803.tar.bz2 +# Source1-md5: 32e01fc7e51b942232f10604966227e2 +Source2: nagios-utils.php #Patch: %{name}-shared.patch # needs finishing Patch0: %{name}-tainted.patch Patch1: %{name}-contrib-API.patch @@ -58,8 +60,10 @@ BuildRequires: rpmbuild(macros) >= 1.177 Requires: nagios-core Obsoletes: netsaint-plugins +Conflicts: nagios < 3.1.2-3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _sysconfdir /etc/nagios/plugins %define _pluginarchdir %{_libdir}/nagios/plugins %define _pluginlibdir %{_prefix}/lib/nagios/plugins %define _noautoprovfiles utils.pm @@ -456,7 +460,8 @@ Wtyczki przekazane do projektu Nagios. Część z nich działa, część nie. %prep -%setup -q %{?_snap:-n %{name}-HEAD-%{_snap}} +%setup -q -a1 +mv nagios-plugins-config-*/* . %patch0 -p1 %patch1 -p1 %patch3 -p1 @@ -595,6 +600,9 @@ cp -a gl/*.h $RPM_BUILD_ROOT%{_includedir}/nagiosplug/gl cp -a lib/*.h $RPM_BUILD_ROOT%{_includedir}/nagiosplug/lib +install -d $RPM_BUILD_ROOT%{_sysconfdir} +cp -a commands/*.cfg $RPM_BUILD_ROOT%{_sysconfdir} + %find_lang %{name} # all files with exec permissions are plugins. @@ -619,7 +627,7 @@ %{__sed} -i -e 's,use lib "%{_pluginarchdir}",use lib "%{_pluginlibdir}",' $RPM_BUILD_ROOT%{_pluginlibdir}/check_* %endif -cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_pluginlibdir}/utils.php +cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_pluginlibdir}/utils.php cp -a contrib/utils.py $RPM_BUILD_ROOT%{_pluginlibdir} chmod a-x $RPM_BUILD_ROOT%{_pluginlibdir}/utils.* @@ -652,40 +660,57 @@ %attr(755,root,root) %{_pluginarchdir}/check_apt %attr(755,root,root) %{_pluginarchdir}/check_cluster %attr(755,root,root) %{_pluginarchdir}/check_cluster2 +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_disk.cfg %attr(755,root,root) %{_pluginarchdir}/check_disk %attr(755,root,root) %{_pluginarchdir}/check_dummy +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_http.cfg %attr(755,root,root) %{_pluginarchdir}/check_http %attr(755,root,root) %{_pluginarchdir}/check_ide_smart %attr(755,root,root) %{_pluginarchdir}/check_mrtg +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_mrtgtraf.cfg %attr(755,root,root) %{_pluginarchdir}/check_mrtgtraf %attr(755,root,root) %{_pluginarchdir}/check_nagios # req: over-cr >= 0.99.53 http://www.molitor.org/overcr %attr(755,root,root) %{_pluginarchdir}/check_overcr +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_procs.cfg %attr(755,root,root) %{_pluginarchdir}/check_procs %attr(755,root,root) %{_pluginarchdir}/check_real +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_smtp.cfg %attr(755,root,root) %{_pluginarchdir}/check_smtp +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_ssh.cfg %attr(755,root,root) %{_pluginarchdir}/check_ssh %attr(755,root,root) %{_pluginarchdir}/check_time %attr(755,root,root) %{_pluginarchdir}/check_ups +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_users.cfg %attr(755,root,root) %{_pluginarchdir}/check_users +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_swap.cfg %attr(755,root,root) %{_pluginarchdir}/check_swap %attr(755,root,root) %{_pluginlibdir}/check_log # check_tcp and symlinks +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_tcp.cfg +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_telnet.cfg +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_spamd.cfg %attr(755,root,root) %{_pluginarchdir}/check_tcp %attr(755,root,root) %{_pluginarchdir}/check_clamd +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_ftp.cfg %attr(755,root,root) %{_pluginarchdir}/check_ftp +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_imap.cfg %attr(755,root,root) %{_pluginarchdir}/check_imap %attr(755,root,root) %{_pluginarchdir}/check_jabber +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_nntp.cfg %attr(755,root,root) %{_pluginarchdir}/check_nntp %attr(755,root,root) %{_pluginarchdir}/check_nntps +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_pop.cfg %attr(755,root,root) %{_pluginarchdir}/check_pop %attr(755,root,root) %{_pluginarchdir}/check_simap %attr(755,root,root) %{_pluginarchdir}/check_spop %attr(755,root,root) %{_pluginarchdir}/check_ssmtp +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_udp.cfg %attr(755,root,root) %{_pluginarchdir}/check_udp # these plugins need suid bit to operate +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_dhcp.cfg %attr(755,root,root) %{_pluginarchdir}/check_dhcp %attr(755,root,root) %{_pluginarchdir}/check_icmp @@ -715,6 +740,7 @@ %files perl %defattr(644,root,root,755) %attr(755,root,root) %{_pluginlibdir}/check_file_age +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_ircd.cfg %attr(755,root,root) %{_pluginlibdir}/check_ircd %attr(755,root,root) %{_pluginlibdir}/check_mailq %attr(755,root,root) %{_pluginlibdir}/check_rpc @@ -725,7 +751,9 @@ # Not to be confused with nagios-snmp-plugins %files snmp %defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_snmp.cfg %attr(755,root,root) %{_pluginarchdir}/check_snmp +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_hpjd.cfg %attr(755,root,root) %{_pluginarchdir}/check_hpjd %attr(755,root,root) %{_pluginlibdir}/check_ifoperstatus %attr(755,root,root) %{_pluginlibdir}/check_ifstatus @@ -742,6 +770,7 @@ %files mysql %defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_mysql.cfg %attr(755,root,root) %{_pluginarchdir}/check_mysql %attr(755,root,root) %{_pluginarchdir}/check_mysql_query @@ -770,6 +799,7 @@ %files -n nagios-plugin-check_dns %defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_dns.cfg %attr(755,root,root) %{_pluginarchdir}/check_dns %files -n nagios-plugin-check_dig @@ -782,10 +812,12 @@ %files -n nagios-plugin-check_load %defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_load.cfg %attr(755,root,root) %{_pluginarchdir}/check_load %files -n nagios-plugin-check_ping %defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_ping.cfg %attr(2755,root,adm) %{_pluginarchdir}/check_ping %files -n nagios-plugin-check_fping @@ -794,6 +826,7 @@ %files contrib %defattr(644,root,root,755) +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_nt.cfg %attr(755,root,root) %{_pluginarchdir}/check_nt %attr(755,root,root) %{_pluginarchdir}/check_nwstat %attr(755,root,root) %{_pluginarchdir}/check_rbl @@ -870,6 +903,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.104 2009/08/03 17:41:25 glen +- default configs for each plugin; rel 11 + Revision 1.103 2009/07/18 09:36:36 marmarek - fix check_snmp_disk_monitor (respect -w and -c) - rel 10 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugins/nagios-plugins.spec?r1=1.103&r2=1.104&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
