diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-10-31 11:17:05 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-10-31 11:17:05 +0000 |
| commit | eb9a0d9e48cb28987dd795293803217427721b8c (patch) | |
| tree | 9124a2575bb845eabea6056fc0ad7b651f996cc1 /docker | |
| parent | Remove usage of deprecated logger.warn method from codebase (#6271) (diff) | |
| parent | Update email section of INSTALL.md about account_threepid_delegates (#6272) (diff) | |
| download | synapse-eb9a0d9e48cb28987dd795293803217427721b8c.tar.xz | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'docker')
| -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" |