Merge lp://staging/~dpb/charms/precise/apache2/avoid-regen-cert into lp://staging/charms/apache2
Proposed by
David Britton
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 57 | ||||||||
Proposed branch: | lp://staging/~dpb/charms/precise/apache2/avoid-regen-cert | ||||||||
Merge into: | lp://staging/charms/apache2 | ||||||||
Diff against target: |
303 lines (+206/-16) 4 files modified
README.md (+2/-1) hooks/hooks.py (+71/-15) hooks/tests/test_balancer_hook.py (+9/-0) hooks/tests/test_cert.py (+124/-0) |
||||||||
To merge this branch: | bzr merge lp://staging/~dpb/charms/precise/apache2/avoid-regen-cert | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Ceppi (community) | Approve | ||
Jorge Niedbalski (community) | Needs Fixing | ||
Review via email:
|
Description of the change
Don't regen a self-signed cert unless we need to:
- pulled out cert generation code
- added test cases for it
- made regeneration dependent on necessity (hostname/ip changed, servername changed, cert is missing/invalid)
- Included small fix for lp:1302645 to install python-yaml
To post a comment you must log in.
Hi David,
I'd like to review this submission but your branch doesn't merge cleanly with lp:charms/apache2. Would you mind pushing an update?
Thanks!
Tim