diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2022-04-11 16:35:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-11 16:35:41 +0100 |
| commit | 214f3b7d215ef57e4482834afc72b280614b9c06 (patch) | |
| tree | 0a2be114c08635df44b1e9bece96494122263ef0 | |
| parent | Do not consider events by ignored users for bundled aggregations (#12235) (diff) | |
| download | synapse-214f3b7d215ef57e4482834afc72b280614b9c06.tar.xz | |
Enable certificate checking during complement tests (#12435)
| -rw-r--r-- | changelog.d/12435.misc | 1 | ||||
| -rw-r--r-- | docker/complement/conf-workers/workers-shared.yaml | 5 | ||||
| -rw-r--r-- | docker/complement/conf/homeserver.yaml | 7 |
3 files changed, 1 insertions, 12 deletions
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 |