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

[Haw Loeung]

Enable cgi module on install otherwise health check succeeds with output from the script; also we want cgid for multi-threaded apache2

[lp:~hloeung/ubuntu-repository-cache/missing-apache2-cgi-mod]

313. By Haw Loeung on 2021-02-22

Enable cgi module on install otherwise health check succeeds with output from the script; also we want cgid for multi-threaded apache2

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

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

[lp:~hloeung/ubuntu-repository-cache/missing-apache2-cgi-mod]

314. By Haw Loeung on 2021-02-22

Ensure apache reloaded/started after enabling various modules in install()

[Paul Collins (pjdc)]

review: Approve (lgtm)

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

Change successfully merged at revision 313

=== modified file 'lib/ubuntu_repository_cache/apache.py'
--- lib/ubuntu_repository_cache/apache.py	2021-02-19 09:11:59 +0000
+++ lib/ubuntu_repository_cache/apache.py	2021-02-22 03:11:35 +0000
@@ -38,6 +38,12 @@
     subprocess.check_call(['a2enmod', 'mpm_worker'])
     subprocess.check_call(['a2dissite', '000-default'])
 
+    config = hookenv.config()
+    if config['enable_healthcheck']:
+        subprocess.check_call(['a2enmod', 'cgid'])
+
+    start()
+
 
 @util.run_as_user('root')
 def start(start_only=False):
@@ -223,7 +229,7 @@
             cmd = 'a2dismod'
             action = 'Disabled'
 
-        subprocess.check_call([cmd, 'cgi'])
+        subprocess.check_call([cmd, 'cgid'])
         LOG('{} health check endpoint'.format(action))
         restart_required = True
 

=== modified file 'tests/unit/test_apache.py'
--- tests/unit/test_apache.py	2021-02-19 09:11:59 +0000
+++ tests/unit/test_apache.py	2021-02-22 03:11:35 +0000
@@ -66,12 +66,12 @@
     def test_configure_health_check(self, check_call, call, seteuid, setegid, chown, write_file):
         config = hookenv.Config({'enable_healthcheck': True})
         self.assertEqual(apache.configure_health_check(config), True)
-        check_call.assert_called_with(['a2enmod', 'cgi'])
+        check_call.assert_called_with(['a2enmod', 'cgid'])
 
         check_call.reset_mock()
         config = hookenv.Config({'enable_healthcheck': False})
         self.assertEqual(apache.configure_health_check(config), True)
-        check_call.assert_called_with(['a2dismod', 'cgi'])
+        check_call.assert_called_with(['a2dismod', 'cgid'])
 
         check_call.reset_mock()
         config = hookenv.Config({'enable_healthcheck': True})