apache2: Properly re-execute Apache on restart

Previously, we sent Apache a signal to relaunch itself which caused
Apache to kill all child processes, and re-execute them.

However, when updating glibc, any newly compiled modules could not be
loaded as Apache was running with the previous version of glibc until
the next reboot.

This change will now properly stop Apache and restart it which solves
this problem.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/initscripts/system/apache b/src/initscripts/system/apache
index 0f4fe4a712d7265f951249d9167587932050e8e9..18eb86e2f6e5c3722adf386ab8ec3b66e65c7f15 100644 (file)
--- a/src/initscripts/system/apache
+++ b/src/initscripts/system/apache
@@ -86,14 +86,13 @@ case "$1" in
 
        stop)
                boot_mesg "Stopping Apache daemon..."
-               killproc /usr/sbin/httpd
+               /usr/sbin/apachectl -k stop
                evaluate_retval
                ;;
 
        restart)
-               boot_mesg "Restarting Apache daemon..."
-               /usr/sbin/apachectl -k restart
-               evaluate_retval
+               $0 stop
+               $0 start
                ;;
 
        reload)