diff mbox series

initscripts: Correctly wait for Apache2 to terminate

Message ID 20240426152838.3768448-1-michael.tremer@ipfire.org
State Staged
Commit 1724e5ac0ac4a139e9f7d574129f53a027197676
Headers
Series initscripts: Correctly wait for Apache2 to terminate |

Commit Message

Michael Tremer April 26, 2024, 3:28 p.m. UTC 
  This is achieved by telling killproc which PIDs to wait for.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/initscripts/system/apache | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/src/initscripts/system/apache b/src/initscripts/system/apache
index 18eb86e2f..e7a62097e 100644
--- a/src/initscripts/system/apache
+++ b/src/initscripts/system/apache
@@ -22,6 +22,8 @@ 
 . /etc/sysconfig/rc
 . $rc_functions
 
+PIDFILE="/var/run/httpd.pid"
+
 generate_certificates() {
 	if [ ! -f "/etc/httpd/server.key" ]; then
 		boot_mesg "Generating HTTPS RSA server key (this will take a moment)..."
@@ -86,8 +88,7 @@  case "$1" in
 
 	stop)
 		boot_mesg "Stopping Apache daemon..."
-		/usr/sbin/apachectl -k stop
-		evaluate_retval
+		killproc /usr/sbin/httpd
 		;;
 
 	restart)