From: Joe Orton <jorton@apache.org>
Date: Tue, 11 Feb 2020 10:38:13 +0000 (+0000)
Subject: Add some blurb on correctly stopping the service w/mod_systemd. [skip ci]
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1664
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f5995f42c5ace46607fe486f2f1deb7fac96ffa;p=thirdparty%2Fapache%2Fhttpd.git

Add some blurb on correctly stopping the service w/mod_systemd. [skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1873889 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_systemd.xml b/docs/manual/mod/mod_systemd.xml
index e24f3fed495..e3e533bf833 100644
--- a/docs/manual/mod/mod_systemd.xml
+++ b/docs/manual/mod/mod_systemd.xml
@@ -47,13 +47,28 @@ After=network.target
 Type=notify
 ExecStart=/usr/local/apache2/bin/httpd -D FOREGROUND -k start
 ExecReload=/usr/local/apache2/bin/httpd -k graceful
-ExecStop=/usr/local/apache2/bin/httpd -k graceful-stop
+KillMode=mixed
 
 [Install]
 WantedBy=multi-user.target
     </pre>
     </example>
 
+   <p>Special attention should be given to how <code>ExecStop</code>
+   and/or <code>KillMode</code> are configured for the service.  If
+   configured, an <code>ExecStop</code> command should be a
+   <em>synchronous operation</em> which itself exits when the daemon
+   has terminated.  Running <code>httpd -k stop</code>
+   <em>asynchronously</em> initiates daemon termination, so does not
+   satisfy this condition.  The example above uses
+   <code>KillMode=mixed</code> so that systemd sends
+   <code>SIGTERM</code> to signal the parent process (and only the
+   parent) to shut down.  The entire process group is then sent
+   <code>SIGKILL</code> after <code>TimeoutStopSec</code> elapses, if
+   any processes are still running.  See <a
+   href="https://www.freedesktop.org/software/systemd/man/systemd.kill.html">systemd.kill(5)</a>
+   for more information.</p>
+    
    <p>This module does not provide support for Systemd socket activation.</p>
 
     <p><directive module="core">ExtendedStatus</directive> is