diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-09-09 14:27:30 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-09-09 14:27:30 +0100 |
| commit | 2c746382e0a5da7e0640b149b2a4620706967324 (patch) | |
| tree | a3629622a9035033fae45d43bc988b5ac51e8961 /synapse/app/homeserver.py | |
| parent | Don't require pdus in check_auth script (diff) | |
| parent | Better document the intent of the insecure SSL setting (diff) | |
| download | synapse-2c746382e0a5da7e0640b149b2a4620706967324.tar.xz | |
Merge branch 'daniel/insecureclient' into develop
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index c23f853230..68d37e5bda 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -221,7 +221,7 @@ class SynapseHomeServer(HomeServer): listener_config, root_resource, ), - self.tls_context_factory, + self.tls_server_context_factory, interface=bind_address ) else: @@ -365,7 +365,6 @@ def setup(config_options): Args: config_options_options: The options passed to Synapse. Usually `sys.argv[1:]`. - should_run (bool): Whether to start the reactor. Returns: HomeServer @@ -388,7 +387,7 @@ def setup(config_options): events.USE_FROZEN_DICTS = config.use_frozen_dicts - tls_context_factory = context_factory.ServerContextFactory(config) + tls_server_context_factory = context_factory.ServerContextFactory(config) database_engine = create_engine(config.database_config["name"]) config.database_config["args"]["cp_openfun"] = database_engine.on_new_connection @@ -396,7 +395,7 @@ def setup(config_options): hs = SynapseHomeServer( config.server_name, db_config=config.database_config, - tls_context_factory=tls_context_factory, + tls_server_context_factory=tls_server_context_factory, config=config, content_addr=config.content_addr, version_string=version_string, |