diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-11-14 11:16:50 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-11-14 11:16:50 +0000 |
| commit | e903c941cb1bed18026f00ed1d3495a8d172f13a (patch) | |
| tree | 894da7441d913361b70da4cc13cd73ead86d2e67 /synapse/config | |
| parent | Remove unused 'context' variables to appease pyflakes (diff) | |
| parent | Add notification-service unit tests. (diff) | |
| download | synapse-e903c941cb1bed18026f00ed1d3495a8d172f13a.tar.xz | |
Merge branch 'develop' into request_logging
Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/server.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 3afda12d5a..814a4c349b 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -30,6 +30,7 @@ class ServerConfig(Config): self.pid_file = self.abspath(args.pid_file) self.webclient = True self.manhole = args.manhole + self.no_tls = args.no_tls if not args.content_addr: host = args.server_name @@ -67,6 +68,8 @@ class ServerConfig(Config): server_group.add_argument("--content-addr", default=None, help="The host and scheme to use for the " "content repository") + server_group.add_argument("--no-tls", action='store_true', + help="Don't bind to the https port.") def read_signing_key(self, signing_key_path): signing_keys = self.read_file(signing_key_path, "signing_key") |