charm-haproxy

Merge lp:~jsing/charm-haproxy/haproxy-external-certs into lp:charm-haproxy

  1. haproxy-external-certs
  2. Merge into trunk
Proposed by Joel Sing
Status: Merged
Approved by: Tom Haddon
Approved revision: 114
Merged at revision: 114
Proposed branch: lp:~jsing/charm-haproxy/haproxy-external-certs
Merge into: lp:charm-haproxy
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/hooks.py (+1/-1)
To merge this branch: bzr merge lp:~jsing/charm-haproxy/haproxy-external-certs
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Review via email: mp+347598@code.launchpad.net

Commit message

Allow the haproxy charm to be used with externally managed certificates.

To post a comment you must log in.
Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM

review: Approve
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 Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 114

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/hooks.py'
2--- hooks/hooks.py 2016-11-22 11:15:13 +0000
3+++ hooks/hooks.py 2018-06-07 14:14:41 +0000
4@@ -778,7 +778,7 @@
5 # Write to disk the content of the given SSL certificates
6 crts = service_config.get('crts', [])
7 for i, crt in enumerate(crts):
8- if crt == "DEFAULT":
9+ if crt == "DEFAULT" or crt == "EXTERNAL":
10 continue
11 content = base64.b64decode(crt)
12 path = get_service_lib_path(service_name)

Subscribers

People subscribed via source and target branches

to all changes: