diff --git a/.gitignore b/.gitignore index 67403c5..2db9b87 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ __pycache__/ conf/live/ conf/cert/ env/ +venv/ .idea/ .env diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml index 6542927..e8e011d 100644 --- a/docker/docker-compose.prod.yml +++ b/docker/docker-compose.prod.yml @@ -2,7 +2,7 @@ version: "2" services: app: - image: pathogen/threshold + image: pathogen/threshold:latest build: ./docker volumes: - ${PORTAINER_GIT_DIR}:/code diff --git a/threshold b/threshold index 32c4a39..b18f93d 100755 --- a/threshold +++ b/threshold @@ -57,11 +57,13 @@ api_enabled = getenv("THRESHOLD_API_ENABLED", main.config["API"]["Enabled"]) in api_address = getenv("THRESHOLD_API_HOST", main.config["API"]["Address"]) api_port = int(getenv("THRESHOLD_API_PORT", main.config["API"]["Port"])) +print("KEY", main.certPath + main.config["Key"]) +print("CERT", main.certPath + main.config["Certificate"]) if __name__ == "__main__": listener = ServerFactory() if listener_ssl is True: reactor.listenSSL( - main.config["Listener"]["Port"], + listener_port, listener, DefaultOpenSSLContextFactory( main.certPath + main.config["Key"],