From 94549771f75935128e3c2633ceeacc6bb2ffba8e Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Tue, 19 Jan 2021 16:19:32 +0000
Subject: [PATCH] Replace 'perspectives' config block with
 'trusted_key_servers' in docker homeserver.yaml template (#9157)

---
 changelog.d/9157.misc       |  1 +
 docker/conf/homeserver.yaml | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 changelog.d/9157.misc

diff --git a/changelog.d/9157.misc b/changelog.d/9157.misc
new file mode 100644
index 0000000000..76b2a66a05
--- /dev/null
+++ b/changelog.d/9157.misc
@@ -0,0 +1 @@
+Replace the old `perspectives` option in the Synapse docker config file template with `trusted_key_servers`.
\ No newline at end of file
diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml
index a808485c12..2ed570a5d1 100644
--- a/docker/conf/homeserver.yaml
+++ b/docker/conf/homeserver.yaml
@@ -198,12 +198,10 @@ old_signing_keys: {}
 key_refresh_interval: "1d" # 1 Day.
 
 # The trusted servers to download signing keys from.
-perspectives:
-  servers:
-    "matrix.org":
-      verify_keys:
-        "ed25519:auto":
-          key: "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"
+trusted_key_servers:
+  - server_name: matrix.org
+    verify_keys:
+      "ed25519:auto": "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"
 
 password_config:
    enabled: true
-- 
GitLab