Merge ~bryce/ubuntu/+source/apache2:apache2-fix-lp1832182-hirsute into ubuntu/+source/apache2:ubuntu/devel

[Bryce Harrington]

This is a re-send of a server-next fix for Apache2, which supersedes an earlier MP targeting groovy: https://code.launchpad.net/~bryce/ubuntu/+source/apache2/+git/apache2/+merge/391856

This fixes some errors in the earlier code and incorporates Christian's review comments. I've tested the code via the test case in the bug with some variations, and it seems good. Autopkgtest checks out too, although the test cases don't exercise the 'graceful' command.

The issue is applicable to all past supported releases, so once this is accepted for hirsute I plan to also apply it to groovy, focal, bionic, and xenial. Thus please also review the SRU text in the bug report itself.

[Lucas Kanashiro (lucaskanashiro)]

I am grabbing this for review.

[Lucas Kanashiro (lucaskanashiro)]

The package changes and the SRU bug description LGMT in general, just some comments below:

- In the changelog your target is groovy but this MP is targeting hirsute.

- This is me being nitpick: I would change this commit message:

commit a4a20160eefd3cd0a3cb07d2a95fb9665c1f2b16
Author: Bryce Harrington <email address hidden>
Date: Mon Oct 5 16:03:00 2020 -0700

    * d/apache2ctl: Also use systemd for graceful if it is in use. This extends an earlier fix for the start command to behave similarly for restart / graceful. Fixes service failures on unattended upgrade. (LP: #1832182)

to something like:

    * d/apache2ctl: Also use systemd for graceful if it is in use (LP: #1832182).

    This extends an earlier fix for the start command to behave similarly for
    restart / graceful. Fixes service failures on unattended upgrade.

It is a better reading IMO.

- I see this same bug was reported to Debian here:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927302

Could we forward these changes to Debian as well?

Apart from that the package built fine and I was able to confirm that the fix is working as expected (following the instructions in the SRU bug). I also confirmed that autopkgtest did not identify any regression (despite it does not exercise the path of proposed changes):

autopkgtest [10:51:10]: @@@@@@@@@@@@@@@@@@@@ summary
run-test-suite PASS
duplicate-module-load PASS
htcacheclean PASS
default-mods PASS
ssl-passphrase PASS
check-http2 PASS
chroot PASS

review: Needs Fixing

[Bryce Harrington (bryce)]

Thanks for the review. I've incorporated the suggested changes.

I've forwarded the debdiff to debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=927302

Branch and PPA are updated.

[Bryce Harrington (bryce)]

Since I incorporated all the review feedback, and since Christian also reviewed and approved the same changes for the SRUs I've gone ahead and uploaded this one too.

review: Approve

Unmerged commits

2fea155... by Bryce Harrington on 2020-10-05

changelog

b021a2a... by Bryce Harrington on 2020-10-05

  * d/apache2ctl: Also use systemd for graceful if it is in use.
    (LP: #1832182)
    - This extends an earlier fix for the start command to behave
      similarly for restart / graceful. Fixes service failures on
      unattended upgrade.

diff --git a/debian/apache2ctl b/debian/apache2ctl
index 404b9f9..1358f2a 100755
--- a/debian/apache2ctl
+++ b/debian/apache2ctl
@@ -143,6 +143,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}
@@ -153,38 +165,38 @@ start)
     # (this is bad if there are several apache2 instances running)
     rm -f ${APACHE_RUN_DIR:-/var/run/apache2}/*ssl_scache*
 
-    need_systemd=false
-    if [ -z "$APACHE_STARTED_BY_SYSTEMD" ] ; then
-        case "$(readlink -f /proc/1/exe)" in
-        *systemd*)
-            need_systemd=true
-            ;;
-        *)
-            ;;
-        esac
-    fi
-    if $need_systemd ; then
+    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"
+        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"
+        ${HTTPD} ${APACHE_ARGUMENTS} -k "${ARGV}"
     fi
 
     ERROR=$?
     ;;
 stop|graceful-stop)
-    $HTTPD ${APACHE_ARGUMENTS} -k "$ARGV"
+    ${HTTPD} ${APACHE_ARGUMENTS} -k "$ARGV"
     ERROR=$?
     ;;
 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 6295e4e..9cdcc74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apache2 (2.4.46-1ubuntu2) hirsute; urgency=medium
+
+  * d/apache2ctl: Also use systemd for graceful if it is in use.
+    (LP: #1832182)
+    - This extends an earlier fix for the start command to behave
+      similarly for restart / graceful.  Fixes service failures on
+      unattended upgrade.
+
+ -- Bryce Harrington <[e-mail]>  Mon, 05 Oct 2020 16:06:32 -0700
+
 apache2 (2.4.46-1ubuntu1) groovy; urgency=medium
 
   * Merge with Debian unstable. Remaining changes: