diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-12 11:42:43 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-12 11:42:43 +0000 |
| commit | 1ed836cc2b909e0bcd439964173008e9755c4750 (patch) | |
| tree | 65862dbcf81107332c0c7c65a2eda86eb6afc9ba /synapse/config/server.py | |
| parent | Merge pull request #59 from matrix-org/hotfixes-v0.6.1f (diff) | |
| parent | Expand on caching (diff) | |
| download | synapse-1ed836cc2b909e0bcd439964173008e9755c4750.tar.xz | |
Merge branch 'release-v0.7.0' of github.com:matrix-org/synapse v0.7.0
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 4f73c85466..31e44cc857 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -47,8 +47,12 @@ class ServerConfig(Config): def add_arguments(cls, parser): super(ServerConfig, cls).add_arguments(parser) server_group = parser.add_argument_group("server") - server_group.add_argument("-H", "--server-name", default="localhost", - help="The name of the server") + server_group.add_argument( + "-H", "--server-name", default="localhost", + help="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." + ) server_group.add_argument("--signing-key-path", help="The signing key to sign messages with") server_group.add_argument("-p", "--bind-port", metavar="PORT", |