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

fixing merge conflict

Browse Source
This commit is contained in:
kevgliss
2015-09-11 08:38:48 -07:00
parent 0dde4c9f80 a512b82196
commit 25f652c1eb
30 changed files with 268 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lemur/plugins/lemur_verisign/plugin.py
View File

@ -146,7 +146,7 @@ class VerisignIssuerPlugin(IssuerPlugin):
:param issuer_options:
:return: :raise Exception:
"""
url = current_app.config.get('VERISIGN_URL') + 'rest/services/enroll'
url = current_app.config.get("VERISIGN_URL") + '/rest/services/enroll'
data = process_options(issuer_options)
data['csr'] = csr
@ -176,7 +176,7 @@ class VerisignIssuerPlugin(IssuerPlugin):
:return:
"""
url = current_app.config.get("VERISIGN_URL") + 'rest/services/getTokens'
url = current_app.config.get("VERISIGN_URL") + '/rest/services/getTokens'
response = self.session.post(url, headers={'content-type': 'application/x-www-form-urlencoded'})
return handle_response(response.content)['Response']['Order']