summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2018-04-25 11:40:37 +0100
committerDavid Baker <dave@matrix.org>2018-04-25 11:40:37 +0100
commit643c89d4974eccda45802bc72d783904784a52a3 (patch)
treec346224c752e5af3974ac9618d098c5e6d24122b
parentOption to defer to an ID server for user_directory (diff)
downloadsynapse-643c89d4974eccda45802bc72d783904784a52a3.tar.xz
Fix spelling & add experimental API comment
-rw-r--r--synapse/config/user_directory.py3
-rw-r--r--synapse/rest/client/v2_alpha/user_directory.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/synapse/config/user_directory.py b/synapse/config/user_directory.py

index 093ebc4d03..9b0ae91289 100644 --- a/synapse/config/user_directory.py +++ b/synapse/config/user_directory.py
@@ -47,6 +47,7 @@ class UserDirectoryConfig(Config): # search_all_users: false # # If this is set, user search will be delegated to this ID server instead - # of synapse performing the saerch itself. + # of synapse performing the search itself. + # This is an experimental API. # defer_to_id_server: id.example.com """ diff --git a/synapse/rest/client/v2_alpha/user_directory.py b/synapse/rest/client/v2_alpha/user_directory.py
index fd36389148..9b1a019978 100644 --- a/synapse/rest/client/v2_alpha/user_directory.py +++ b/synapse/rest/client/v2_alpha/user_directory.py
@@ -64,7 +64,7 @@ class UserDirectorySearchRestServlet(RestServlet): if self.hs.config.user_directory_defer_to_id_server: signed_body = sign_json(body, self.hs.hostname, self.hs.config.signing_key[0]) - url = "https://%s/_matrix/identity/api/v1/user_directory/search" % ( + url = "http://%s/_matrix/identity/api/v1/user_directory/search" % ( self.hs.config.user_directory_defer_to_id_server, ) resp = yield self.http_client.post_json_get_json(url, signed_body)