valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adding intermediate certificate support to rest_cherrypy (#32941)

Browse Source 
This change configures cherrypy to use an intermediate certificate.
I did some manual testing to make sure it works... self-signed
certs (with no intermediate configured in the master conf) still work...
and I tested with a valid GoDaddy cert and their intermediate too.
This commit is contained in:
cmclaughlin 2016-04-29 09:31:38 -07:00 committed by Nicole Thomas
parent 5c31a0651f
commit 187fcb236f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/netapi/rest_cherrypy/__init__.py
View File

@ -92,5 +92,7 @@ def start():
cherrypy.server.ssl_module = 'builtin'
cherrypy.server.ssl_certificate = apiopts['ssl_crt']
cherrypy.server.ssl_private_key = apiopts['ssl_key']
if 'ssl_chain' in apiopts.keys():
cherrypy.server.ssl_certificate_chain = apiopts['ssl_chain']
cherrypy.quickstart(root, apiopts.get('root_prefix', '/'), conf)