diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-01-04 14:02:50 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-01-04 14:02:50 +0000 |
| commit | f35f8d06ea58e2d0cdccd82924c7a44fd93f4c38 (patch) | |
| tree | dc5312558565f8ac01264be21d388e563a5c8c58 /synapse/config/server.py | |
| parent | Added info abou Martin Giess' auto-deployment process with vagrant/ansible (diff) | |
| parent | Bump changelog and version for v0.12.0 (diff) | |
| download | synapse-f35f8d06ea58e2d0cdccd82924c7a44fd93f4c38.tar.xz | |
Merge remote-tracking branch 'origin/release-v0.12.0' v0.12.0
Diffstat (limited to 'synapse/config/server.py')
| -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 |