Merge lp://staging/~bloodearnest/charms/trusty/apache2/fix-mpm-type into lp://staging/charms/trusty/apache2
Proposed by
Simon Davy
| Status: | Merged |
|---|---|
| Merged at revision: | 65 |
| Proposed branch: | lp://staging/~bloodearnest/charms/trusty/apache2/fix-mpm-type |
| Merge into: | lp://staging/charms/trusty/apache2 |
| Diff against target: |
162 lines (+98/-10) 5 files modified
Makefile (+2/-1) hooks/hooks.py (+41/-6) hooks/tests/test_config_changed.py (+3/-2) tests/10-bundles-test.py (+1/-1) tests/20-mpm-test.py (+51/-0) |
| To merge this branch: | bzr merge lp://staging/~bloodearnest/charms/trusty/apache2/fix-mpm-type |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tom Haddon (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fixes configuration of mpm_type is broken on trusty.
Description of the change
Fixes configuration of mpm_type is broken on trusty, which is broken completely.
Apache 2.4 on trusty defaults to mpm_event, and all mpm modules are compiled in, and require explicit a2en/dismodding. The charm was written for precise, and just purged/installed apache2-mpm-{type} package to a) install the module and b) switch the worker type.
In trusty, these packages are just transitional packages that install nothing and do not switch modules.
This change refactors the mpm management to work on trusty, and adds amulet test coverage for *all three* worker types (previously, mpm_event was *not* supported).
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good. I've confirmed the issue with the current charm, and that upgrading to this version fixes it so that setting the mpm_type config variable works as expected.