This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, core185 has been updated via 6d75ade14f55c7eed637904f51a23f5afe79f9a0 (commit) from 6af919ec6cee61235bdecfeb806cc0456494578c (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 6d75ade14f55c7eed637904f51a23f5afe79f9a0 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Apr 26 15:28:38 2024 +0000
initscripts: Correctly wait for Apache2 to terminate
This is achieved by telling killproc which PIDs to wait for.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: src/initscripts/system/apache | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Difference in files: 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)
hooks/post-receive -- IPFire 2.x development tree