[Pkg-nagios-changes] [pkg-nagios] r691 - nagios2/trunk/debian

[Sean Finney]

Author: seanius
Date: 2006-02-03 17:20:51 +0000 (Fri, 03 Feb 2006)
New Revision: 691

Modified:
   nagios2/trunk/debian/changelog
   nagios2/trunk/debian/control
   nagios2/trunk/debian/httpd.webapps-common
Log:
"running" httpd detection fix
added joerg to Uploaders


Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2006-02-03 15:36:15 UTC (rev 690)
+++ nagios2/trunk/debian/changelog	2006-02-03 17:20:51 UTC (rev 691)
@@ -11,6 +11,8 @@
   * conditionally stop the nagios2 daemon in the nagios2 packages' prerm,
     for cases where it is being purged before nagios2-common's prerm
     does so (the latter will not stop it otherwise).
+  * added Joerg Jaspert to the Uploaders field.
+  * fix to httpd configuration to properly detect apache2 processes
 
  -- Marc Haber <mh+debian-packages at zugschlus.de>  Mon, 23 Jan 2006 19:11:32 +0000
 

Modified: nagios2/trunk/debian/control
===================================================================
--- nagios2/trunk/debian/control	2006-02-03 15:36:15 UTC (rev 690)
+++ nagios2/trunk/debian/control	2006-02-03 17:20:51 UTC (rev 691)
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
-Uploaders: sean finney <seanius at debian.org>, Marc Haber <mh+debian-packages at zugschlus.de>
+Uploaders: sean finney <seanius at debian.org>, Marc Haber <mh+debian-packages at zugschlus.de>, Joerg Jaspert <joerg at debian.org>
 Standards-Version: 3.6.2
 Build-Depends: debhelper (>= 5), dpatch (>= 2.0.10), libperl-dev, libpng12-dev, libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1), iputils-ping, autotools-dev
 

Modified: nagios2/trunk/debian/httpd.webapps-common
===================================================================
--- nagios2/trunk/debian/httpd.webapps-common	2006-02-03 15:36:15 UTC (rev 690)
+++ nagios2/trunk/debian/httpd.webapps-common	2006-02-03 17:20:51 UTC (rev 691)
@@ -43,7 +43,7 @@
 		httpds=$wc_httpd_supported
 	fi
 	for f in $httpds; do
-		if pgrep -fx /usr/sbin/$f >/dev/null; then
+		if pgrep -fx "/usr/sbin/$f( .*)*$" >/dev/null; then
 			echo $f
 		fi
 	done