Merge ~npochet/charm-nagios:fix-ssl into ~nagios-charmers/charm-nagios:master
Proposed by
Nicolas Pochet
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Tom Haddon | ||||
Approved revision: | cdbbeb8c709361771f39982370a3cb26a63be15a | ||||
Merged at revision: | cec6830a4a9dcbde6611c634fbd7f43fb69a2fdf | ||||
Proposed branch: | ~npochet/charm-nagios:fix-ssl | ||||
Merge into: | ~nagios-charmers/charm-nagios:master | ||||
Diff against target: |
67 lines (+9/-7) 2 files modified
hooks/templates/default-ssl.tmpl (+2/-2) hooks/upgrade-charm (+7/-5) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tom Haddon | Approve | ||
Stuart Bishop (community) | Approve | ||
Review via email: mp+366648@code.launchpad.net |
Commit message
Fix typo for SSL
* Write ssl file to /etc/apache2/
instead of /etc/apache2/
* Modify template to point to /var/www/html
* Fixes LP:1777904
Description of the change
Fix typo for SSL
* Write ssl file to /etc/apache2/
instead of /etc/apache2/
* Modify template to point to /var/www/html
* Fixes LP:1777904
To post a comment you must log in.
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.