diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-06 11:45:22 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-06 11:45:22 +0000 |
| commit | b1491dfd7cdfe1109b8bb7eac78ad96b69ffafca (patch) | |
| tree | 90fa52927fe0be0850f6bb0ee4686626cc929a64 /synapse/config/server.py | |
| parent | Merge pull request #102 from matrix-org/randomize_stream_timeout (diff) | |
| parent | Unused import (diff) | |
| download | synapse-b1491dfd7cdfe1109b8bb7eac78ad96b69ffafca.tar.xz | |
Merge pull request #103 from matrix-org/no_tls_private_key
Don't look for a TLS private key if we have set --no-tls
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 4e4892d40b..b042d4eed9 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -30,7 +30,6 @@ class ServerConfig(Config): self.pid_file = self.abspath(args.pid_file) self.webclient = True self.manhole = args.manhole - self.no_tls = args.no_tls self.soft_file_limit = args.soft_file_limit if not args.content_addr: @@ -76,8 +75,6 @@ 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.") server_group.add_argument("--soft-file-limit", type=int, default=0, help="Set the soft limit on the number of " "file descriptors synapse can use. " |