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

Moved url to config file instead of plugin option. One one url can be supported 

unless both the token and url are moved to the plugin options.
This commit is contained in:
alwaysjolley 2019-02-26 09:15:12 -05:00
parent cd65a36437
commit 53301728fa
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lemur/plugins/lemur_vault/plugin.py
View File

@ -47,11 +47,11 @@ class VaultDestinationPlugin(DestinationPlugin):
'helpMessage': 'Must be a valid Vault secrets path'
},
{
'name': 'vaultUrl',
'name': 'objectName',
'type': 'str',
'required': True,
'validation': '^https?://[a-zA-Z0-9.-]+(?::[0-9]+)?$',
'helpMessage': 'Must be a valid Vault server url'
'required': False,
'validation': '[0-9a-zA-Z:_-]+',
'helpMessage': 'Name to bundle certs under, if blank use cn'
},
{
'name': 'bundleChain',
@ -64,13 +64,6 @@ class VaultDestinationPlugin(DestinationPlugin):
],
'required': True,
'helpMessage': 'Bundle the chain into the certificate'
},
{
'name': 'objectName',
'type': 'str',
'required': False,
'validation': '[0-9a-zA-Z:_-]+',
'helpMessage': 'Name to bundle certs under, if blank use cn'
}
]
@ -93,10 +86,10 @@ class VaultDestinationPlugin(DestinationPlugin):
sans_name = '{0}.san'.format(cname)
token = current_app.config.get('VAULT_TOKEN')
url = current_app.config.get('VAULT_URL')
mount = self.get_option('vaultMount', options)
path = self.get_option('vaultPath', options)
url = self.get_option('vaultUrl', options)
bundle = self.get_option('bundleChain', options)
obj_name = self.get_option('objectName', options)