From a32aa2ce71f5c208b44fad4343412cd9f5e713f1 Mon Sep 17 00:00:00 2001 From: Amber Brown Date: Mon, 29 Apr 2019 20:28:40 +1000 Subject: [PATCH] patch up docker --- docker/start.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docker/start.py b/docker/start.py index 2da555272a45..6affd06d94b9 100755 --- a/docker/start.py +++ b/docker/start.py @@ -47,6 +47,11 @@ def generate_secrets(environ, secrets): # In normal mode, generate missing keys if any, then run synapse else: + + # tell synapse to put any generated keys in /data rather than /compiled by + # default + SYNAPSE_KEY_PATH = environ.get("SYNAPSE_KEY_PATH", "/data") + if "SYNAPSE_CONFIG_PATH" in environ: config_path = environ["SYNAPSE_CONFIG_PATH"] else: @@ -59,7 +64,7 @@ def generate_secrets(environ, secrets): if not os.path.exists("/compiled"): os.mkdir("/compiled") config_path = "/compiled/homeserver.yaml" - + # Convert SYNAPSE_NO_TLS to boolean if exists if "SYNAPSE_NO_TLS" in environ: tlsanswerstring = str.lower(environ["SYNAPSE_NO_TLS"]) @@ -79,9 +84,7 @@ def generate_secrets(environ, secrets): args += [ "--config-path", config_path, - - # tell synapse to put any generated keys in /data rather than /compiled - "--keys-directory", "/data", + "--keys-directory", SYNAPSE_KEY_PATH ] # Generate missing keys and start synapse