This repository was archived by the owner on Apr 12, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 3 files changed +35
-8
lines changed Expand file tree Collapse file tree 3 files changed +35
-8
lines changed Original file line number Diff line number Diff line change 1+ Improve description of `server_name` config option in `homserver.yaml`.
Original file line number Diff line number Diff line change 3333
3434# # Server ##
3535
36- # The domain name of the server, with optional explicit port.
37- # This is used by remote servers to connect to this server,
38- # e.g. matrix.org, localhost:8080, etc.
39- # This is also the last part of your UserID.
36+ # The public-facing domain of the server
37+ #
38+ # The server_name name will appear at the end of usernames and room addresses
39+ # created on this server. For example if the server_name was example.com,
40+ # usernames on this server would be in the format @user:example.com
41+ #
42+ # In most cases you should avoid using a matrix specific subdomain such as
43+ # matrix.example.com or synapse.example.com as the server_name for the same
44+ # reasons you wouldn't use [email protected] as your email address.45+ # See https://github.com/matrix-org/synapse/blob/master/docs/delegate.md
46+ # for information on how to host Synapse on a subdomain while preserving
47+ # a clean server_name.
48+ #
49+ # The server_name cannot be changed later so it is important to
50+ # configure this correctly before you start Synapse. It should be all
51+ # lowercase and may contain an explicit port.
52+ # Examples: matrix.org, localhost:8080
4053#
4154server_name : " SERVERNAME"
4255
Original file line number Diff line number Diff line change @@ -641,10 +641,23 @@ def generate_config_section(
641641 """\
642642 ## Server ##
643643
644- # The domain name of the server, with optional explicit port.
645- # This is used by remote servers to connect to this server,
646- # e.g. matrix.org, localhost:8080, etc.
647- # This is also the last part of your UserID.
644+ # The public-facing domain of the server
645+ #
646+ # The server_name name will appear at the end of usernames and room addresses
647+ # created on this server. For example if the server_name was example.com,
648+ # usernames on this server would be in the format @user:example.com
649+ #
650+ # In most cases you should avoid using a matrix specific subdomain such as
651+ # matrix.example.com or synapse.example.com as the server_name for the same
652+ # reasons you wouldn't use [email protected] as your email address. 653+ # See https://github.com/matrix-org/synapse/blob/master/docs/delegate.md
654+ # for information on how to host Synapse on a subdomain while preserving
655+ # a clean server_name.
656+ #
657+ # The server_name cannot be changed later so it is important to
658+ # configure this correctly before you start Synapse. It should be all
659+ # lowercase and may contain an explicit port.
660+ # Examples: matrix.org, localhost:8080
648661 #
649662 server_name: "%(server_name)s"
650663
You can’t perform that action at this time.
0 commit comments