diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-16 15:34:50 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-16 15:34:50 +0000 |
| commit | 8be0e3720325209ddd7afea1b4e256a8fb4d34f7 (patch) | |
| tree | 523827c99ed86f0493f129a18c9e3c5bb5401932 | |
| parent | Fix CI for synapse_port_db (#6276) (diff) | |
| parent | Clarify environment variable usage when running in Docker (#6181) (diff) | |
| download | synapse-8be0e3720325209ddd7afea1b4e256a8fb4d34f7.tar.xz | |
Clarify environment variable usage when running in Docker (#6181)
* commit '213d7eb22': Clarify environment variable usage when running in Docker (#6181)
| -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" |