diff options
| author | Anton Lazarev <antonok35@gmail.com> | 2019-10-30 00:30:04 -0700 |
|---|---|---|
| committer | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-10-30 07:30:04 +0000 |
| commit | 213d7eb22739c66ca3af0c33be4377906f35b426 (patch) | |
| tree | 62ebd2677421e2fc5234b8358cdc64ddb0f4c3a5 /docker/start.py | |
| parent | 1.5.0 (diff) | |
| download | synapse-213d7eb22739c66ca3af0c33be4377906f35b426.tar.xz | |
Clarify environment variable usage when running in Docker (#6181)
Diffstat (limited to 'docker/start.py')
| -rwxr-xr-x | docker/start.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/start.py b/docker/start.py index e41ea20e70..6e1cb807a1 100755 --- a/docker/start.py +++ b/docker/start.py @@ -217,8 +217,9 @@ def main(args, environ): # backwards-compatibility generate-a-config-on-the-fly mode if "SYNAPSE_CONFIG_PATH" in environ: error( - "SYNAPSE_SERVER_NAME and SYNAPSE_CONFIG_PATH are mutually exclusive " - "except in `generate` or `migrate_config` mode." + "SYNAPSE_SERVER_NAME can only be combined with SYNAPSE_CONFIG_PATH " + "in `generate` or `migrate_config` mode. To start synapse using a " + "config file, unset the SYNAPSE_SERVER_NAME environment variable." ) config_path = "/compiled/homeserver.yaml" |