packages: nagios/nagios.spec - fix check result path in config too; rel 4

glen glen at pld-linux.org
Tue Aug 4 08:22:33 CEST 2009


Author: glen                         Date: Tue Aug  4 06:22:33 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix check result path in config too; rel 4

---- Files affected:
packages/nagios:
   nagios.spec (1.132 -> 1.133) 

---- Diffs:

================================================================
Index: packages/nagios/nagios.spec
diff -u packages/nagios/nagios.spec:1.132 packages/nagios/nagios.spec:1.133
--- packages/nagios/nagios.spec:1.132	Tue Aug  4 08:20:21 2009
+++ packages/nagios/nagios.spec	Tue Aug  4 08:22:28 2009
@@ -10,7 +10,7 @@
 Summary(pt_BR.UTF-8):	Programa para monitoração de máquinas e serviços
 Name:		nagios
 Version:	3.1.2
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Networking
 Source0:	http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
@@ -217,7 +217,7 @@
 	--with-command-user=%{name} \
 	--with-command-grp=%{name} \
 	--with-lockfile=%{_localstatedir}/%{name}.pid \
-	--with-checkresult-dir=%{_var}/spool/nagios/checkresults \
+	--with-checkresult-dir=%{_var}/spool/%{name}/checkresults \
 	--with-ping_command='/bin/ping -n %%s -c %%d' \
 	%{!?with_gd:--disable-statusmap --disable-trends} \
 	%{?with_tests:--enable-libtap} \
@@ -346,13 +346,14 @@
 %triggerpostun -- nagios-cgi < 2.0-0.b3.21
 chown root:http %{_sysconfdir}/cgi.cfg
 
-%triggerpostun -- nagios < 3.1.2-3
+%triggerpostun -- nagios < 3.1.2-4
 # restore lost files
 for a in dependencies.cfg services.cfg serviceextinfo.cfg hosts.cfg hostgroups.cfg hostextinfo.cfg escalations.cfg checkcommands.cfg misccommands.cfg; do
 	if [ -f %{_sysconfdir}/$a.rpmsave -a ! -f %{_sysconfdir}/$a ]; then
 		mv -f %{_sysconfdir}/$a{.rpmsave,}
 	fi
 done
+%{__sed} -i -e 's,^check_result_path=.*,check_result_path=%{_var}/spool/%{name}/checkresults,' %{_sysconfdir}/nagios.cfg
 
 %files
 %defattr(644,root,root,755)
@@ -366,7 +367,7 @@
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/nagiostats
 
-%attr(770,root,nagios-data) %dir %{_var}/log/%{name}
+%attr(770,root,nagios-data) %dir %{_var}/log/%{nam}
 %attr(770,root,nagios-data) %dir %{_var}/log/%{name}/archives
 
 %attr(770,root,nagios-data) %dir %{_localstatedir}
@@ -378,8 +379,8 @@
 %attr(664,root,nagios) %ghost %{_localstatedir}/%{name}.tmp
 
 %dir %{_var}/spool
-%dir %{_var}/spool/nagios
-%attr(770,root,nagios) %dir %{_var}/spool/nagios/checkresults
+%dir %{_var}/spool/%{name}
+%attr(770,root,nagios) %dir %{_var}/spool/%{name}/checkresults
 
 %{_examplesdir}/%{name}-%{version}
 
@@ -439,6 +440,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.133  2009/08/04 06:22:28  glen
+- fix check result path in config too; rel 4
+
 Revision 1.132  2009/08/04 06:20:21  glen
 - move checkresult dir to /var/spool/nagios/checkresults
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios.spec?r1=1.132&r2=1.133&f=u



More information about the pld-cvs-commit mailing list