aboutsummaryrefslogtreecommitdiffstats
path: root/termcast_server/__init__.py
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2014-10-16 13:07:32 -0400
committerJesse Luehrs <doy@tozt.net>2014-10-16 13:07:32 -0400
commitf2b2b81ca7227b3f9cbee2b7e9e5f6ff4e2867e8 (patch)
tree08917a60e83945e10ac5bee6b93da5e68d806f5b /termcast_server/__init__.py
parent3333fe100c8c50ac1660adf984ac054bf79d0586 (diff)
downloadpython-termcast-server-f2b2b81ca7227b3f9cbee2b7e9e5f6ff4e2867e8.tar.gz
python-termcast-server-f2b2b81ca7227b3f9cbee2b7e9e5f6ff4e2867e8.zip
add ssl support
Diffstat (limited to 'termcast_server/__init__.py')
-rw-r--r--termcast_server/__init__.py9
1 files changed, 5 insertions, 4 deletions
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()