diff options
author | kaiyou <pierre@jaury.eu> | 2018-02-09 00:13:26 +0100 |
---|---|---|
committer | kaiyou <pierre@jaury.eu> | 2018-02-09 00:13:26 +0100 |
commit | e511979fe6c4a03da3e9c1d16672e263f54ee2d3 (patch) | |
tree | 89564035e1bd601408fb6754224847e4c370acfb /contrib/docker/start.py | |
parent | Specify the Docker registry for the postgres image (diff) | |
download | synapse-e511979fe6c4a03da3e9c1d16672e263f54ee2d3.tar.xz |
Make SYNAPSE_MACAROON_SECRET_KEY a mandatory option
Diffstat (limited to 'contrib/docker/start.py')
-rwxr-xr-x | contrib/docker/start.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/docker/start.py b/contrib/docker/start.py index 32142bbe00..d4c1140b1d 100755 --- a/contrib/docker/start.py +++ b/contrib/docker/start.py @@ -44,8 +44,8 @@ else: if "SYNAPSE_CONFIG_PATH" in environ: args += ["--config-path", environ["SYNAPSE_CONFIG_PATH"]] else: - check_arguments(environ, ("SYNAPSE_SERVER_NAME", "SYNAPSE_REPORT_STATS")) - generate_secrets(environ, ("SYNAPSE_REGISTRATION_SHARED_SECRET", "SYNAPSE_MACAROON_SECRET_KEY")) + check_arguments(environ, ("SYNAPSE_SERVER_NAME", "SYNAPSE_REPORT_STATS", "SYNAPSE_MACAROON_SECRET_KEY")) + generate_secrets(environ, ("SYNAPSE_REGISTRATION_SHARED_SECRET",)) environ["SYNAPSE_APPSERVICES"] = glob.glob("/data/appservices/*.yaml") if not os.path.exists("/compiled"): os.mkdir("/compiled") convert("/conf/homeserver.yaml", "/compiled/homeserver.yaml", environ) |