bootstack-ops

Merge bootstack-ops:mask_ssl_chain into bootstack-ops:master

  1. Git
  2. lp:bootstack-ops
  3. mask_ssl_chain
  4. Merge into master
Proposed by Joe Guo
Status: Merged
Approved by: Xav Paice
Approved revision: 36d6eb22428fd52c9bf4712db08694596cb0492f
Merged at revision: 79c46108c69582fed1cb990bdfeebd9ccca23afd
Proposed branch: bootstack-ops:mask_ssl_chain
Merge into: bootstack-ops:master
Diff against target: 13 lines (+1/-1)
1 file modified
bootstack-ops/juju_bundle_export.py (+1/-1)
Reviewer Review Type Date Requested Status
Xav Paice (community) Approve
Review via email: mp+384081@code.launchpad.net

Commit message

juju_bundle_export.py: add ssl_chain to MASK_KEYS

`ssl_chain` from nagios charm should also be masked.

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
Xav Paice (xavpaice) wrote :

LGTM

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

Change successfully merged at revision 79c46108c69582fed1cb990bdfeebd9ccca23afd

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bootstack-ops/juju_bundle_export.py b/bootstack-ops/juju_bundle_export.py
2index 8f1845d..93e4653 100755
3--- a/bootstack-ops/juju_bundle_export.py
4+++ b/bootstack-ops/juju_bundle_export.py
5@@ -29,7 +29,7 @@ import argparse
6 import math
7
8
9-MASK_KEYS = ('(.*(ssl-public-key|ssl[_-](ca|cert|key)|secret|password|'
10+MASK_KEYS = ('(.*(ssl-public-key|ssl[_-](ca|cert|key|chain)|secret|password|'
11 'pagerduty_key|license-file|registration-key|token|accesskey|'
12 'private-ppa|(http|https)://.*:.+\@|os-credentials).*)|key|'
13 'ldaps://.*|livepatch_key|tls-ca-ldap')

Subscribers

People subscribed via source and target branches

to all changes: