rpms/nagios/devel nagios-initrd.patch, NONE, 1.1 nagios.spec, 1.17, 1.18

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30002

Modified Files:
	nagios.spec 
Added Files:
	nagios-initrd.patch 
Log Message:
init.d patch - Bugzilla #191046


nagios-initrd.patch:

--- NEW FILE nagios-initrd.patch ---
--- nagios	2006-05-08 10:39:49.000000000 -0300
+++ daemon-init.in	2006-05-08 10:33:26.000000000 -0300
@@ -114,11 +114,13 @@
 		echo "Starting network monitor: nagios"
 		$NagiosBin -v $NagiosCfgFile > /dev/null 2>&1;
 		if [ $? -eq 0 ]; then
-			su - $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile"
+                        touch $NagiosVarDir/nagios.log $NagiosRetentionFile
+                        chown $NagiosUser:$NagiosGroup $NagiosVarDir/nagios.log $NagiosRetentionFile
 			rm -f $NagiosCommandFile
 			touch $NagiosRunFile
 			chown $NagiosUser:$NagiosGroup $NagiosRunFile
 			$NagiosBin -d $NagiosCfgFile
+                        pidof nagios > $NagiosRunFile
 			if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi
 			#sleep 1
 			#status_nagios nagios


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nagios.spec	4 May 2006 03:32:52 -0000	1.17
+++ nagios.spec	9 May 2006 23:25:13 -0000	1.18
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -9,6 +9,7 @@
 Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
 Source1: nagios.logrotate
 Source2: nagios.htaccess
+Patch0: nagios-initrd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gd-devel > 1.8, mailx
@@ -51,6 +52,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 
 
 %build
 ./configure \
@@ -155,6 +157,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Tue May 09 2006 Mike McGrath <imlinux at gmail.com> 2.3-2
+- updates to the init script that prevented nagios from shutting down
+
 * Wed May 03 2006 Mike McGrath <imlinux at gmail.com> 2.3-1
 - Upstream released 2.3
 - Bug fix for negative HTTP content_length header in CGIs