X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/5a33b8a100c2cacceea4922c51164c696629f993..47b9cb0d87524e6598da025f3c49cd013f00606b:/files/etc/init.d/apache2.invirt diff --git a/files/etc/init.d/apache2.invirt b/files/etc/init.d/apache2.invirt index 9b81115..21249ff 100755 --- a/files/etc/init.d/apache2.invirt +++ b/files/etc/init.d/apache2.invirt @@ -24,7 +24,7 @@ kstart_start () { chown www-data $KRB5CCNAME /sbin/start-stop-daemon --start --pidfile "$TMP_PIDFILE" -c www-data \ --exec /usr/bin/k5start -- -b -p "$TMP_PIDFILE" \ - -f "$KSTART_KEYTAB" -K10 -S afs -I "$AFSCELL" -t \ + -f "$KSTART_KEYTAB" -K10 -t \ "daemon/$(hostname -f)" cat "$TMP_PIDFILE" >|"$KSTART_PIDFILE" rm -f "$TMP_PIDFILE" @@ -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"