summary refs log tree commit diff
path: root/synapse/app/user_dir.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-08-10 12:23:54 +0100
committerGitHub <noreply@github.com>2018-08-10 12:23:54 +0100
commit3c0213a21754c9ad8f9309d7548284dd08302a92 (patch)
treebc9f07fdeb29929d3601afbe9a5891d932e519f8 /synapse/app/user_dir.py
parentMerge pull request #3655 from matrix-org/neilj/disable_hs (diff)
parentmore generic conversion of str/bytes to unicode (diff)
downloadsynapse-3c0213a21754c9ad8f9309d7548284dd08302a92.tar.xz
Merge pull request #3439 from vojeroen/send_sni_for_federation_requests
send SNI for federation requests
Diffstat (limited to 'synapse/app/user_dir.py')
-rw-r--r--synapse/app/user_dir.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py
index 637a89530a..cb78de8834 100644
--- a/synapse/app/user_dir.py
+++ b/synapse/app/user_dir.py
@@ -214,11 +214,13 @@ def start(config_options):
     config.update_user_directory = True
 
     tls_server_context_factory = context_factory.ServerContextFactory(config)
+    tls_client_options_factory = context_factory.ClientTLSOptionsFactory(config)
 
     ps = UserDirectoryServer(
         config.server_name,
         db_config=config.database_config,
         tls_server_context_factory=tls_server_context_factory,
+        tls_client_options_factory=tls_client_options_factory,
         config=config,
         version_string="Synapse/" + get_version_string(synapse),
         database_engine=database_engine,