Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into restore-manage-shebang

This commit is contained in:
Curtis 2019-06-25 09:29:06 -07:00 committed by GitHub
parent 404b7a25bc 3434f78e50
commit 8fbff00850
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lemur/plugins/lemur_vault_dest/plugin.py Normal file → Executable file
View File

@ -259,16 +259,21 @@ class VaultDestinationPlugin(DestinationPlugin):
secret = get_secret(client, mount, path) secret = get_secret(client, mount, path)
secret["data"][cname] = {} secret["data"][cname] = {}
if not cert_chain:
chain = ''
else:
chain = cert_chain
if bundle == "Nginx": if bundle == "Nginx":
secret["data"][cname]["crt"] = "{0}\n{1}".format(body, cert_chain) secret["data"][cname]["crt"] = "{0}\n{1}".format(body, chain)
secret["data"][cname]["key"] = private_key secret["data"][cname]["key"] = private_key
elif bundle == "Apache": elif bundle == "Apache":
secret["data"][cname]["crt"] = body secret["data"][cname]["crt"] = body
secret["data"][cname]["chain"] = cert_chain secret["data"][cname]["chain"] = chain
secret["data"][cname]["key"] = private_key secret["data"][cname]["key"] = private_key
elif bundle == "PEM": elif bundle == "PEM":
secret["data"][cname]["pem"] = "{0}\n{1}\n{2}".format( secret["data"][cname]["pem"] = "{0}\n{1}\n{2}".format(
body, cert_chain, private_key body, chain, private_key
) )
else: else:
secret["data"][cname]["crt"] = body secret["data"][cname]["crt"] = body