From 36314f09ae6b8cee95d1545b91686eaa03da6e11 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Mon, 7 Jun 2021 13:23:53 -0400 Subject: [PATCH] island: Use certificate provided in config, not environment variables --- monkey/monkey_island/cc/server_setup.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/monkey/monkey_island/cc/server_setup.py b/monkey/monkey_island/cc/server_setup.py index 63918f567..7e32ce26b 100644 --- a/monkey/monkey_island/cc/server_setup.py +++ b/monkey/monkey_island/cc/server_setup.py @@ -1,6 +1,5 @@ import json import logging -import os import sys from pathlib import Path from threading import Thread @@ -99,9 +98,8 @@ def _start_island_server(should_setup_only, config_options: IslandConfigOptions) http_server = WSGIServer( ("0.0.0.0", env_singleton.env.get_island_port()), app, - # TODO: modify next two lines? - certfile=os.environ.get("SERVER_CRT", crt_path), - keyfile=os.environ.get("SERVER_KEY", key_path), + certfile=crt_path, + keyfile=key_path, ) _log_init_info() http_server.serve_forever()