summaryrefslogtreecommitdiff
path: root/beinc_server.py
diff options
context:
space:
mode:
authorSimeon Simeonov2014-05-08 22:52:20 +0200
committerSimeon Simeonov2014-05-08 22:52:20 +0200
commit81cf914085c509b3ec0d5407c3572ce1c22c14bc (patch)
tree325d13807fc01d72b8944b38f0eae573a17a0b82 /beinc_server.py
parentf29504285598af79076c981985dccb1d2033efd4 (diff)
A few fixes and bugfixes
Diffstat (limited to 'beinc_server.py')
-rwxr-xr-xbeinc_server.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/beinc_server.py b/beinc_server.py
index 1ed5563..64e21f5 100755
--- a/beinc_server.py
+++ b/beinc_server.py
@@ -275,12 +275,13 @@ def main():
275 sys.stderr.write('Unable to parse {0}: {1}'.format(args.config_file, 275 sys.stderr.write('Unable to parse {0}: {1}'.format(args.config_file,
276 e)) 276 e))
277 sys.exit(errno.EIO) 277 sys.exit(errno.EIO)
278 ssl_module = config_dict['server']['general']['ssl_module'].encode('utf-8')
278 ssl_certificate = config_dict['server']['general']['ssl_certificate'] 279 ssl_certificate = config_dict['server']['general']['ssl_certificate']
279 ssl_private_key = config_dict['server']['general']['ssl_private_key'] 280 ssl_private_key = config_dict['server']['general']['ssl_private_key']
280 cherrypy.config.update({ 281 cherrypy.config.update({
281 'server.socket_host': args.hostname, 282 'server.socket_host': args.hostname,
282 'server.socket_port': args.port, 283 'server.socket_port': args.port,
283 'server.ssl_module': config_dict['server']['general']['ssl_module'], 284 'server.ssl_module': ssl_module,
284 'server.ssl_certificate': ssl_certificate, 285 'server.ssl_certificate': ssl_certificate,
285 'server.ssl_private_key': ssl_private_key, 286 'server.ssl_private_key': ssl_private_key,
286 'tools.encode.on': True, 287 'tools.encode.on': True,