Merge ~axino/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:axino into ubuntu-mirror-charm:master

Proposed by Junien F
Status: Merged
Approved by: Benjamin Allot
Approved revision: f62c564ae69d48911b2170ceba8186d9251e4629
Merged at revision: 46e4ebb6f3c9ca4770a89f1c011523d6dc4dcedc
Proposed branch: ~axino/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:axino
Merge into: ubuntu-mirror-charm:master
Diff against target: 19 lines (+2/-6)
1 file modified
hooks/hooks.py (+2/-6)
Reviewer Review Type Date Requested Status
🤖 Canonical IS Review Bot Approve
Canonical IS Reviewers Pending
Ubuntu Mirror Charm Maintainers Pending
Review via email: mp+447169@code.launchpad.net

Commit message

switch back to mpm_event, we've been using that in production for a while now

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
🤖 Canonical IS Review Bot (canonical-is-reviewbot) wrote :

Proxy approval for ballot

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 46e4ebb6f3c9ca4770a89f1c011523d6dc4dcedc

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/hooks.py b/hooks/hooks.py
2index e39276b..444fa52 100755
3--- a/hooks/hooks.py
4+++ b/hooks/hooks.py
5@@ -672,12 +672,8 @@ def configure_apache_mpm(conf, hostname): # noqa: C901
6 status_set('blocked', error_message)
7 sys.exit(1)
8
9- # Revert back to MPM worker for now:
10- # https://bz.apache.org/bugzilla/show_bug.cgi?id=53555
11- # mpm_file = "/etc/apache2/mods-available/mpm_event.conf"
12- # mpm_module = "mpm_event"
13- mpm_file = "/etc/apache2/mods-available/mpm_worker.conf"
14- mpm_module = "mpm_worker"
15+ mpm_file = "/etc/apache2/mods-available/mpm_event.conf"
16+ mpm_module = "mpm_event"
17 current_mpm_module = 'mpm_{}'.format(check_output(["/usr/sbin/a2query", "-M"]))
18 if current_mpm_module == 'mpm_None':
19 log("CHARM: Query for existing module failed, setting to {}"

Subscribers

People subscribed via source and target branches