summary refs log tree commit diff
diff options
context:
space:
mode:
authorreivilibre <oliverw@matrix.org>2022-05-23 12:20:30 +0100
committerGitHub <noreply@github.com>2022-05-23 12:20:30 +0100
commit438925c422fec9bffe6e90633abe8875c0c5fb5c (patch)
tree5c38c2b507c966b985a67ab18dbb45fd65b0ea76
parentAdd a windows->unix file endings commit to git blame ignore file (#12824) (diff)
downloadsynapse-438925c422fec9bffe6e90633abe8875c0c5fb5c.tar.xz
Fix Complement `TestCanRegisterAdmin` with workers, by adding Complement's shared registration secret. (#12819)
-rw-r--r--changelog.d/12819.misc1
-rw-r--r--docker/complement/conf-workers/workers-shared.yaml6
2 files changed, 7 insertions, 0 deletions
diff --git a/changelog.d/12819.misc b/changelog.d/12819.misc
new file mode 100644

index 0000000000..7a03102a63 --- /dev/null +++ b/changelog.d/12819.misc
@@ -0,0 +1 @@ +Add Complement's shared registration secret to the Complement worker image. This fixes tests that depend on it. \ No newline at end of file diff --git a/docker/complement/conf-workers/workers-shared.yaml b/docker/complement/conf-workers/workers-shared.yaml
index 86ee11ecd0..cd7b50c65c 100644 --- a/docker/complement/conf-workers/workers-shared.yaml +++ b/docker/complement/conf-workers/workers-shared.yaml
@@ -5,6 +5,12 @@ enable_registration: true enable_registration_without_verification: true bcrypt_rounds: 4 +## Registration ## + +# Needed by Complement to register admin users +# DO NOT USE in a production configuration! This should be a random secret. +registration_shared_secret: complement + ## Federation ## # trust certs signed by Complement's CA