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

Fixed adding an actual wsgi app from switch from cheroot to cherrypy

Browse Source
This commit is contained in:
Seth House 2012-11-15 21:27:45 -07:00
parent 38fd2da0ec
commit 344f57c4f6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
saltapi/netapi/rest_cherrypy/__init__.py
View File

@ -305,9 +305,11 @@ def start():
else:
root.verify_certs(gconf['ssl_crt'], gconf['ssl_key'])
app = cherrypy.tree.mount(root, '/', config=conf)
ssl_a = wsgiserver.ssl_builtin.BuiltinSSLAdapter(
gconf['ssl_crt'], gconf['ssl_key'])
wsgi_d = wsgiserver.WSGIPathInfoDispatcher({'/': root})
wsgi_d = wsgiserver.WSGIPathInfoDispatcher({'/': app})
server = wsgiserver.CherryPyWSGIServer(
('0.0.0.0', gconf['server.socket_port']),
wsgi_app=wsgi_d)