vault-charm

Merge ~gnuoy/vault-charm:bug/1747130 into ~vault-charmers/vault-charm/+git/vault-charm:master

  1. Git
  2. lp:~gnuoy/vault-charm
  3. bug/1747130
  4. Merge into master
Proposed by Liam Young
Status: Merged
Approved by: Stuart Bishop
Approved revision: 776e9f506abb2e6357b47791d1de5974ea3ac38a
Merged at revision: d529f40620d7926d93c73993a36cefd2e435ba05
Proposed branch: ~gnuoy/vault-charm:bug/1747130
Merge into: ~vault-charmers/vault-charm/+git/vault-charm:master
Diff against target: 14 lines (+1/-1)
1 file modified
reactive/vault.py (+1/-1)
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Review via email: mp+337114@code.launchpad.net

Commit message

Remove 'SSL key...installed' message when it isn't

To post a comment you must log in.
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
Stuart Bishop (stub) wrote :

Ok

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision d529f40620d7926d93c73993a36cefd2e435ba05

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reactive/vault.py b/reactive/vault.py
2index 9cf06d5..adbaa15 100644
3--- a/reactive/vault.py
4+++ b/reactive/vault.py
5@@ -134,10 +134,10 @@ def configure_ssl():
6 ssl_cert = ssl_cert + base64.decodestring(c['ssl-chain'].encode())
7 write_file('/var/snap/vault/common/vault.crt', ssl_cert, perms=0o600)
8 set_state('vault.ssl.available')
9+ status_set('active', 'SSL key and cert installed')
10 else:
11 remove_state('vault.ssl.available')
12 set_state('vault.ssl.configured')
13- status_set('active', 'SSL key and cert installed')
14 remove_state('configured')
15
16

Subscribers

People subscribed via source and target branches

to all changes: