diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-03-06 17:28:49 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-03-06 17:28:49 +0000 |
| commit | 34ce2ca62f261311a9082b6e243eb6c584487025 (patch) | |
| tree | 0144c0f0a8231e2ea68e23c7d5676f48e42ee775 /synapse/config/server.py | |
| parent | Assign the AS ID from the database; replace old placeholder txn id. (diff) | |
| parent | When setting display name more graciously handle failures to update room state. (diff) | |
| download | synapse-34ce2ca62f261311a9082b6e243eb6c584487025.tar.xz | |
Merge branch 'develop' into application-services-txn-reliability
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. " |