Merge ~bryce/ubuntu/+source/apache2:sru-lp1832182-graceful-xenial into ubuntu/+source/apache2:ubuntu/xenial-devel

[Bryce Harrington]

Backport to xenial of fix from
https://code.launchpad.net/~bryce/ubuntu/+source/apache2/+git/apache2/+merge/393426

In bionic and newer, the 'start' command has already been updated to work with systemd, but that fix appears to have not been backported to xenial. (I'm not certain why; guessing it's just an oversight?)

This branch backports that older fix along with this expansion of the fix to also cover the 'graceful' command.

PPA: https://launchpad.net/~bryce/+archive/ubuntu/apache2-sru-lp1832182
SRU: https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1832182
Forwarded to Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927302

n.b. I will be SRUing this branch along with a fix for https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1899611, but doing this MP in isolation for review convenience.

[Christian Ehrhardt  (paelzer)]

This MP only has the changelog commit - forgot something to push?

[Christian Ehrhardt  (paelzer)]

review: Needs Fixing

826c7d3... by Bryce Harrington on 2020-11-16

  * d/apache2ctl: Use systemd for start and graceful if in use.
    (LP: #1832182)

[Bryce Harrington (bryce)]

Thanks for catching that. This branch is slightly different from the others in that it didn't have the prior fix for start, and I just forgot to commit the combined changes.

[Christian Ehrhardt  (paelzer)]

In regard to the discussion we had in the MPs for newer releases - in Xenial start didn't issue the messages yet. We could now either go:
a) on the SRU let us not add stdout messages to start&graceful
or
b) let us add the same that was added in later releases (matches what is proposed right now)

Should we maybe get an SRU member to comment on their preference before uploading to proposed?

+1 from the MP review POV.

review: Approve

[Bryce Harrington (bryce)]

I've gone ahead and uploaded it. Since the messages print only for the currently bugged case I don't think the extra verbosity is going to be an issue. But I'll mention it in the SRU to highlight the situation for the SRU reviewer. I'm combining this with the conf file fix for MP 1899611 so there may end up being some discussion on this already.

Thanks again for the reviews.

Unmerged commits

a687388... by Bryce Harrington on 2020-11-13

changelog

826c7d3... by Bryce Harrington on 2020-11-16

  * d/apache2ctl: Use systemd for start and graceful if in use.
    (LP: #1832182)

diff --git a/debian/apache2ctl b/debian/apache2ctl
index 63db198..845b40c 100755
--- a/debian/apache2ctl
+++ b/debian/apache2ctl
@@ -131,6 +131,18 @@ mkdir_chown () {
     fi
 }
 
+need_systemd () {
+    # Detect if systemd is in use and should be used for managing
+    # the Apache2 httpd service.  Returns 0 if so, 1 otherwise.
+    if [ -z "${APACHE_STARTED_BY_SYSTEMD}" ]; then
+	case "$(readlink -f /proc/1/exe)" in
+	    *systemd*)
+		return 0
+		;;
+	esac
+    fi
+    return 1
+}
 
 [ ! -d ${APACHE_RUN_DIR:-/var/run/apache2} ] && mkdir -p ${APACHE_RUN_DIR:-/var/run/apache2}
 [ ! -d ${APACHE_LOCK_DIR:-/var/lock/apache2} ] && mkdir_chown ${APACHE_RUN_USER:-www-data} ${APACHE_LOCK_DIR:-/var/lock/apache2}
@@ -140,7 +152,18 @@ start)
     # ssl_scache shouldn't be here if we're just starting up.
     # (this is bad if there are several apache2 instances running)
     rm -f ${APACHE_RUN_DIR:-/var/run/apache2}/*ssl_scache*
-    $HTTPD ${APACHE_ARGUMENTS} -k $ARGV
+
+    if need_systemd; then
+        # If running on systemd we should not start httpd without systemd
+        # or systemd will get confused about the status of httpd.
+        echo "Invoking 'systemctl start ${APACHE_SYSTEMD_SERVICE}'."
+        echo "Use 'systemctl status ${APACHE_SYSTEMD_SERVICE}' for more info."
+        systemctl start "${APACHE_SYSTEMD_SERVICE}"
+    else
+        unset APACHE_STARTED_BY_SYSTEMD
+        ${HTTPD} ${APACHE_ARGUMENTS} -k "${ARGV}"
+    fi
+
     ERROR=$?
     ;;
 stop|graceful-stop)
@@ -149,9 +172,19 @@ stop|graceful-stop)
     ;;
 restart|graceful)
     if $HTTPD ${APACHE_ARGUMENTS} -t 2> /dev/null ; then
-        $HTTPD ${APACHE_ARGUMENTS} -k $ARGV
+        if need_systemd; then
+            # If running on systemd we should not directly restart httpd since
+            # systemd would be confused about httpd's status.
+            # (See LP: #1832182)
+            echo "Invoking 'systemctl restart ${APACHE_SYSTEMD_SERVICE}'."
+            echo "Use 'systemctl status ${APACHE_SYSTEMD_SERVICE}' for more info."
+            systemctl restart "${APACHE_SYSTEMD_SERVICE}"
+        else
+            unset APACHE_STARTED_BY_SYSTEMD
+            ${HTTPD} ${APACHE_ARGUMENTS} -k "${ARGV}"
+        fi
     else
-        $HTTPD ${APACHE_ARGUMENTS} -t
+        ${HTTPD} ${APACHE_ARGUMENTS} -t
     fi
     ERROR=$?
     ;;
diff --git a/debian/changelog b/debian/changelog
index 659f7b8..502810f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.4.18-2ubuntu3.18) xenial; urgency=medium
+
+  * d/apache2ctl: Use systemd for start and graceful if in use.
+    (LP: #1832182)
+
+ -- Bryce Harrington <[e-mail]>  Fri, 13 Nov 2020 01:36:15 +0000
+
 apache2 (2.4.18-2ubuntu3.17) xenial-security; urgency=medium
 
   * SECURITY UPDATE: mod_rewrite redirect issue