diff options
| author | David Baker <dave@matrix.org> | 2015-01-13 13:15:51 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-01-13 13:15:51 +0000 |
| commit | c06a9063e1d838f776edfd79cfc8ab29c748d794 (patch) | |
| tree | bcfa472e65d4dacbab666d5787eff9293e5ccc41 /synapse/config/server.py | |
| parent | Split out function to decide whether to notify or a given event (diff) | |
| parent | Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-c06a9063e1d838f776edfd79cfc8ab29c748d794.tar.xz | |
Merge branch 'develop' into pushers
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index f8a0844b8c..31e44cc857 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2014 OpenMarket Ltd +# Copyright 2014, 2015 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -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", |