summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorShay <hillerys@element.io>2021-11-23 06:46:40 -0800
committerGitHub <noreply@github.com>2021-11-23 06:46:40 -0800
commit7cebaf96447a8ff50c4525ba7667f58127876c5e (patch)
tree0f1226134100c933ce1431406c21098c4ad2081d /docker
parentMerge branch 'master' into develop (diff)
downloadsynapse-7cebaf96447a8ff50c4525ba7667f58127876c5e.tar.xz
Remove code invalidated by deprecated config flag 'trust_identity_servers_for_password_resets' (#11395)
* remove background update code related to deprecated config flag

* changelog entry

* update changelog

* Delete 11394.removal

Duplicate, wrong number

* add no-op background update and change newfragment so it will be consolidated with associated work

* remove unused code

* Remove code associated with deprecated flag from legacy docker dynamic config file

Co-authored-by: reivilibre <oliverw@matrix.org>
Diffstat (limited to 'docker')
-rw-r--r--docker/conf/homeserver.yaml8
1 files changed, 0 insertions, 8 deletions
diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml

index 3cba594d02..f10f78a48c 100644 --- a/docker/conf/homeserver.yaml +++ b/docker/conf/homeserver.yaml
@@ -148,14 +148,6 @@ bcrypt_rounds: 12 allow_guest_access: {{ "True" if SYNAPSE_ALLOW_GUEST else "False" }} enable_group_creation: true -# The list of identity servers trusted to verify third party -# identifiers by this server. -# -# Also defines the ID server which will be called when an account is -# deactivated (one will be picked arbitrarily). -trusted_third_party_id_servers: - - matrix.org - - vector.im ## Metrics ###