Merge lp:~hloeung/ubuntu-repository-cache/missing-apache2-cgi-mod-2 into lp:ubuntu-repository-cache

[Haw Loeung]

Don't serve health-check files if cgid module isn't load

If the cgid module isn't loaded, apache will serve the health-check
script as a file resulting in a HTTP/200 so FEs will continue to try
send traffic to the unit. Instead, we want it to fail, 404.

[Benjamin Allot (ballot)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 314

=== modified file 'templates/apache2/archive_ubuntu_com.conf'
--- templates/apache2/archive_ubuntu_com.conf	2021-02-16 04:42:21 +0000
+++ templates/apache2/archive_ubuntu_com.conf	2021-02-22 22:14:40 +0000
@@ -33,6 +33,7 @@
         </Directory>
 
 {% if Enable_Healthcheck %}
+        <IfModule cgid_module>
         Alias /_health-check/ {{ DocumentRoot }}/health-check/
         <Directory "{{ DocumentRoot }}/health-check/">
             Options +ExecCGI
@@ -41,6 +42,7 @@
             Require all granted
         </Directory>
         ProxyPass /_health-check/ !
+        </IfModule>
 {% endif %}
         # This mirror does not contain pool data.  Instead, forward
         # that through squid-deb-proxy.