diff options
| author | Erik Johnston <erik@matrix.org> | 2015-12-02 10:08:18 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-12-02 10:08:18 +0000 |
| commit | 03b2a6a8aa33a66970fc4c0787c661236a466460 (patch) | |
| tree | f1979c228c5bd066c64cf35435aca8e233bc081c /synapse | |
| parent | Merge pull request #408 from matrix-org/markjh/distributor_facade (diff) | |
| parent | Added a single line to explain what the server_name is used for (diff) | |
| download | synapse-03b2a6a8aa33a66970fc4c0787c661236a466460.tar.xz | |
Merge pull request #409 from MadsRC/develop
Develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/config/server.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 5c2d6bfeab..187edd516b 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -133,6 +133,7 @@ class ServerConfig(Config): # 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. server_name: "%(server_name)s" # When running as a daemon, the file to store the pid in |