Merge ~cjwatson/launchpad:charm-librarian-restricted-frontend-relation into launchpad:master
Proposed by
Colin Watson
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | f494c63833b36892ff35aa24301fbd6f77e6c4f1 |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | not available |
Proposed branch: | ~cjwatson/launchpad:charm-librarian-restricted-frontend-relation |
Merge into: | launchpad:master |
Diff against target: |
185 lines (+92/-49) 6 files modified
charm/launchpad-librarian/metadata.yaml (+2/-0) charm/launchpad-librarian/reactive/launchpad-librarian.py (+41/-0) charm/launchpad-librarian/templates/vhosts/librarian-http.conf.j2 (+0/-12) charm/launchpad-librarian/templates/vhosts/librarian-https.conf.j2 (+0/-37) charm/launchpad-librarian/templates/vhosts/restricted-librarian-http.conf.j2 (+12/-0) charm/launchpad-librarian/templates/vhosts/restricted-librarian-https.conf.j2 (+37/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Simone Pelosi | Approve | ||
Review via email: mp+448400@code.launchpad.net |
Commit message
charm: Separate restricted librarian vhost configuration
Description of the change
I'd hoped to avoid this and to be able to combine the public and restricted librarians onto a single set of IP addresses, but the restricted librarian relies on wildcard DNS (*.restricted.
To post a comment you must log in.
LGTM!