apache: Wait until apache has stopped when we want to stop it

[ipfire-2.x.git] / src / initscripts / system / apache

diff --git a/src/initscripts/system/apache b/src/initscripts/system/apache
index 541141e3b186e1a49cefe453aa68c49c89e4c84c..f2a9fb87207d4a2bea16f7aebaa80777b86cdd43 100644 (file)
--- a/src/initscripts/system/apache
+++ b/src/initscripts/system/apache
@@ -11,6 +11,7 @@ generate_certificates() {
        if [ ! -f "/etc/httpd/server.key" ]; then
                boot_mesg "Generating HTTPS RSA server key (this will take a moment)..."
                openssl genrsa -out /etc/httpd/server.key 4096 &>/dev/null
+               chmod 600 /etc/httpd/server.key
                evaluate_retval
        fi
 
@@ -18,6 +19,7 @@ generate_certificates() {
                boot_mesg "Generating HTTPS ECDSA server key..."
                openssl ecparam -genkey -name secp384r1 -noout \
                        -out /etc/httpd/server-ecdsa.key &>/dev/null
+               chmod 600 /etc/httpd/server-ecdsa.key
                evaluate_retval
        fi
 
@@ -66,7 +68,7 @@ case "$1" in
 
        stop)
                boot_mesg "Stopping Apache daemon..."
-               /usr/sbin/apachectl -k stop
+               killproc /usr/sbin/httpd
                evaluate_retval
                ;;