From 214f3b7d215ef57e4482834afc72b280614b9c06 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Mon, 11 Apr 2022 16:35:41 +0100
Subject: [PATCH] Enable certificate checking during complement tests (#12435)

---
 changelog.d/12435.misc                             | 1 +
 docker/complement/conf-workers/workers-shared.yaml | 5 -----
 docker/complement/conf/homeserver.yaml             | 7 -------
 3 files changed, 1 insertion(+), 12 deletions(-)
 create mode 100644 changelog.d/12435.misc

diff --git a/changelog.d/12435.misc b/changelog.d/12435.misc
new file mode 100644
index 0000000000..3a68452573
--- /dev/null
+++ b/changelog.d/12435.misc
@@ -0,0 +1 @@
+Enable certificate checking during complement tests.
diff --git a/docker/complement/conf-workers/workers-shared.yaml b/docker/complement/conf-workers/workers-shared.yaml
index cdadb736f6..8b69870377 100644
--- a/docker/complement/conf-workers/workers-shared.yaml
+++ b/docker/complement/conf-workers/workers-shared.yaml
@@ -7,11 +7,6 @@ bcrypt_rounds: 4
 
 ## Federation ##
 
-# disable verification of federation certificates
-#
-# TODO: Figure out why this is still needed even though we are making use of the custom CA
-federation_verify_certificates: false
-
 # trust certs signed by Complement's CA
 federation_custom_ca_list:
 - /complement/ca/ca.crt
diff --git a/docker/complement/conf/homeserver.yaml b/docker/complement/conf/homeserver.yaml
index be53c4aa2e..c9d6a31240 100644
--- a/docker/complement/conf/homeserver.yaml
+++ b/docker/complement/conf/homeserver.yaml
@@ -41,13 +41,6 @@ database:
 
 ## Federation ##
 
-
-# disable verification of federation certificates
-#
-# TODO: this is temporary; see
-# https://github.com/matrix-org/synapse/issues/11803
-federation_verify_certificates: false
-
 # trust certs signed by the complement CA
 federation_custom_ca_list:
 - /complement/ca/ca.crt