From f2b2b81ca7227b3f9cbee2b7e9e5f6ff4e2867e8 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Thu, 16 Oct 2014 13:07:32 -0400 Subject: add ssl support --- termcast_server/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'termcast_server/__init__.py') diff --git a/termcast_server/__init__.py b/termcast_server/__init__.py index 35ff278..e570d7e 100644 --- a/termcast_server/__init__.py +++ b/termcast_server/__init__.py @@ -10,9 +10,10 @@ from . import termcast from . import web class Server(object): - def __init__(self, keyfile): + def __init__(self, keyfile, pemfile): self.publisher = pubsub.Publisher() self.keyfile = keyfile + self.pemfile = pemfile def listen(self): ssh_sock = self._open_socket(2200) @@ -44,7 +45,7 @@ class Server(object): def wait_for_web_connection(self, sock): sock.setblocking(0) sock.listen(100) - web.start_server(sock, self.publisher) + web.start_server(sock, self.publisher, self.pemfile) def handle_ssh_connection(self, client): self._handle_connection( @@ -58,7 +59,7 @@ class Server(object): self._handle_connection( client, lambda client, connection_id: termcast.Connection( - client, connection_id, self.publisher + client, connection_id, self.publisher, self.pemfile ) ) @@ -87,5 +88,5 @@ class Server(object): return sock def main(): - server = Server(sys.argv[1]) + server = Server(sys.argv[1], sys.argv[2]) server.listen() -- cgit v1.2.3-54-g00ecf