summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAaron Raimist <aaron@raim.ist>2020-09-29 12:50:25 -0500
committerGitHub <noreply@github.com>2020-09-29 13:50:25 -0400
commit8238b55e08e8fbd7c7169b72281538a3e34c6488 (patch)
tree61f9cb13b2744dbad0522611e0904c7d06f2717e /synapse
parentDiscard an empty upload_name before persisting an uploaded file (#7905) (diff)
downloadsynapse-8238b55e08e8fbd7c7169b72281538a3e34c6488.tar.xz
Update description of server_name config option (#8415)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/server.py21
1 files changed, 17 insertions, 4 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 532b910470..ef6d70e3f8 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -641,10 +641,23 @@ class ServerConfig(Config):
             """\
         ## Server ##
 
-        # The domain name of the server, with optional explicit port.
-        # This is used by remote servers to connect to this server,
-        # e.g. matrix.org, localhost:8080, etc.
-        # This is also the last part of your UserID.
+        # The public-facing domain of the server
+        #
+        # The server_name name will appear at the end of usernames and room addresses
+        # created on this server. For example if the server_name was example.com,
+        # usernames on this server would be in the format @user:example.com
+        #
+        # In most cases you should avoid using a matrix specific subdomain such as
+        # matrix.example.com or synapse.example.com as the server_name for the same
+        # reasons you wouldn't use user@email.example.com as your email address.
+        # See https://github.com/matrix-org/synapse/blob/master/docs/delegate.md
+        # for information on how to host Synapse on a subdomain while preserving
+        # a clean server_name.
+        #
+        # The server_name cannot be changed later so it is important to
+        # configure this correctly before you start Synapse. It should be all
+        # lowercase and may contain an explicit port.
+        # Examples: matrix.org, localhost:8080
         #
         server_name: "%(server_name)s"