Hello community, here is the log from the commit of package nagios checked in at Tue Jan 9 00:04:57 CET 2007. -------- --- nagios/nagios.changes 2006-12-01 11:56:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/nagios/nagios.changes 2007-01-08 22:30:28.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 8 22:30:07 CET 2007 - olh@suse.de + +- move pid file to /var/run/nagios/ (#231169) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.u25047/_old 2007-01-09 00:04:41.000000000 +0100 +++ /var/tmp/diff_new_pack.u25047/_new 2007-01-09 00:04:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nagios (Version 2.6) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,17 +14,18 @@ BuildRequires: apache2-devel freetype2-devel gd-devel iputils libapr-util1-devel libjpeg-devel libpng-devel mailx pcre-devel xorg-x11-devel Summary: The Nagios Network Monitor Version: 2.6 -Release: 1 +Release: 12 URL: http://www.nagios.org/ License: GNU General Public License (GPL) Group: System/Monitoring -PreReq: %insserv_prereq %fillup_prereq coreutils /usr/sbin/useradd /usr/sbin/groupadd +PreReq: %insserv_prereq %fillup_prereq sed grep coreutils /usr/sbin/useradd /usr/sbin/groupadd BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nsusr nagios %define nsgrp nagios %define cmdusr nobody %define cmdgrp www -%define nslockfile /var/run/nagios.pid +%define nslockfile_dir /var/run/nagios +%define nslockfile %{nslockfile_dir}/nagios.pid %define apxs2 /usr/sbin/apxs2-prefork %define apache2_sysconfdir %(%{apxs2} -q SYSCONFDIR) Source0: %{name}-%{version}.tar.bz2 @@ -101,6 +102,8 @@ install -d -m 0755 ${RPM_BUILD_ROOT}/etc/init.d install -d -m 0755 ${RPM_BUILD_ROOT}/%{apache2_sysconfdir}/conf.d/ install -d -m 0755 ${RPM_BUILD_ROOT}/etc/logrotate.d/ +install -d -m 0755 ${RPM_BUILD_ROOT}%{nslockfile_dir} +touch ${RPM_BUILD_ROOT}%{nslockfile} make DESTDIR=$RPM_BUILD_ROOT INSTALL_OPTS="" COMMAND_OPTS="" INIT_OPTS= STRIP=: install make DESTDIR=$RPM_BUILD_ROOT INSTALL_OPTS="" COMMAND_OPTS="" INIT_OPTS= CGICFGDIR=/etc/nagios install-config for i in $RPM_BUILD_ROOT/etc/nagios/*-sample ; do @@ -115,7 +118,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/lib/nagios/plugins # install SuSE specials cp %{SOURCE3} $RPM_BUILD_ROOT/%{apache2_sysconfdir}/conf.d/nagios.conf -install -m 744 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/nagios +sed "s@^NAGIOS_PID=.*@NAGIOS_PID=%{nslockfile}@" %{SOURCE1} > $RPM_BUILD_ROOT/etc/init.d/nagios ln -sf ../../etc/init.d/nagios $RPM_BUILD_ROOT/usr/sbin/rcnagios install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/logrotate.d/nagios @@ -125,6 +128,15 @@ %post %{fillup_and_insserv nagios} +# Update ? +if [ ${FIRST_ARG:-0} -gt 1 ]; then + if [ -f /etc/nagios/nagios.cfg ]; then + if ! grep -q lock_file=%{nslockfile} /etc/nagios/nagios.cfg ; then + echo "updating pid lock_file= to %{nslockfile} in /etc/nagios/nagios.cfg" + sed -i "s@^lock_file=.*@lock_file=%{nslockfile}@" /etc/nagios/nagios.cfg + fi + fi +fi %preun %stop_on_removal nagios @@ -150,7 +162,9 @@ %dir %attr(755,%{nsusr},%{nsgrp}) /var/log/nagios %dir %attr(755,%{nsusr},%{nsgrp}) /var/log/nagios/archives %dir %attr(2775,%{nsusr},%{cmdgrp}) /var/spool/nagios -%config /etc/init.d/nagios +%dir %attr(755,%{nsusr},%{nsgrp}) %{nslockfile_dir} +%attr(0644,%{nsusr},%{nsgrp}) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nagios/nagios.pid +%attr(0744,root,root) %config /etc/init.d/nagios %{_prefix}/sbin/* %{_prefix}/include/nagios/locations.h %config(noreplace) /etc/nagios/[!r]* @@ -168,6 +182,8 @@ %config(noreplace) %{apache2_sysconfdir}/conf.d/* %changelog -n nagios +* Mon Jan 08 2007 - olh@suse.de +- move pid file to /var/run/nagios/ (#231169) * Fri Dec 01 2006 - tsieden@suse.de - update to version 2.6 * fix for unscheduled triggered downtime entries ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org