invirt-web: make initscript stop command not leave apache2 processes lying around

This makes restart/force-reload work correctly.

svn path=/trunk/packages/invirt-web/; revision=1855

diff --git a/debian/changelog b/debian/changelog
index d70d063..55a5caa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-web (0.0.16) unstable; urgency=low
+
+  * make initscript stop command not leave apache2 processes lying around
+    (so that restart works)
+
+ -- Greg Price <price@mit.edu>  Fri, 19 Dec 2008 22:34:31 -0500
+
 invirt-web (0.0.15) unstable; urgency=low
 
   * config.{authn[0] => kerberos}.realm

diff --git a/files/etc/init.d/apache2.invirt b/files/etc/init.d/apache2.invirt
index 9b81115..3a4d69b 100755 (executable)
--- a/files/etc/init.d/apache2.invirt
+++ b/files/etc/init.d/apache2.invirt
@@ -32,6 +32,11 @@ kstart_start () {
 kstart_stop () {
     if [ -e $KSTART_PIDFILE ]; then
        /sbin/start-stop-daemon --stop --pidfile $KSTART_PIDFILE
+        pgrep apache2 >/dev/null && sleep 1 \
+         && pgrep apache2 >/dev/null && sleep 1 \
+         && pgrep apache2 >/dev/null && sleep 1 \
+         && pgrep apache2 >/dev/null && sleep 1 \
+         && pkill -9 apache2
        rm -f $KSTART_PIDFILE
     else
        echo -n " ... no kstart pidfile"