Enable TLS on websockets.

Enable TLS on websockets.

Fixed how we dynamically switch the wrapped protocol
when a secure connection is used.
The server now uses TLS both for web and websocket
connections.
The https and wss connections use the same port.

https://code.launchpad.net/~frankban/juju/enable-tls/+merge/131358

(do not edit description out of merge proposal)

[frankban, 2012-10-25 09:48:12]

Please take a look.

[hazmat, 2012-10-26 07:26:21]

looks good, one minor, let me know what you think.

https://codereview.appspot.com/6765051/diff/1/juju/agents/api.py
File juju/agents/api.py (right):

https://codereview.appspot.com/6765051/diff/1/juju/agents/api.py#newcode44
juju/agents/api.py:44: os.path.join(os.path.dirname(__file__), 'keys'))
if your up for it, i'd like this to be a cli option with a fallback to included
if not specified, rather then a hardcode.

https://codereview.appspot.com/6765051/diff/1/juju/lib/websockets.py
File juju/lib/websockets.py (right):

https://codereview.appspot.com/6765051/diff/1/juju/lib/websockets.py#newcode514
juju/lib/websockets.py:514: if request.isSecure():
beautiful

[frankban, 2012-10-29 09:30:24]

Please take a look.