Clarify environment variable usage when running in Docker (#6181)

* commit '213d7eb22': Clarify environment variable usage when running in Docker (#6181)
matrix-org · Mar 16, 2020 · 8be0e37 · 8be0e37
2 parents b3564c9 + 213d7eb
commit 8be0e37
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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"