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

Merge branch 'master' into improved_verify

This commit is contained in:
Curtis 2018-09-06 07:33:55 -07:00 committed by GitHub
parent 2815ddf6c8 85b035e6ad
commit c9836fbf25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST.in
View File

@ -1,4 +1,4 @@
include setup.py version.py package.json bower.json gulpfile.js README.rst MANIFEST.in LICENSE AUTHORS include setup.py version.py package.json bower.json gulpfile.js README.rst MANIFEST.in LICENSE AUTHORS requirements*.txt
recursive-include lemur/plugins/lemur_email/templates * recursive-include lemur/plugins/lemur_email/templates *
recursive-include lemur/static * recursive-include lemur/static *
global-exclude *~ global-exclude *~

2
lemur/plugins/lemur_cfssl/plugin.py
View File

@ -52,7 +52,7 @@ class CfsslIssuerPlugin(IssuerPlugin):
if response.status_code > 399: if response.status_code > 399:
metrics.send('cfssl_create_certificate_failure', 'counter', 1) metrics.send('cfssl_create_certificate_failure', 'counter', 1)
raise Exception( raise Exception(
"Error revoking cert. Please check your CFSSL API server") "Error creating cert. Please check your CFSSL API server")
response_json = json.loads(response.content.decode('utf_8')) response_json = json.loads(response.content.decode('utf_8'))
cert = response_json['result']['certificate'] cert = response_json['result']['certificate']
parsed_cert = parse_certificate(cert) parsed_cert = parse_certificate(cert)