From c02c04af4be5065728b8f517343957518072bb36 Mon Sep 17 00:00:00 2001 From: Val Lorentz Date: Mon, 2 Oct 2023 21:21:43 +0000 Subject: [PATCH] Document that matrix.org is the default notary server since https://gitlab.com/famedly/conduit/-/merge_requests/536 --- DEPLOY.md | 5 +++-- conduit-example.toml | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/DEPLOY.md b/DEPLOY.md index cb318eee..15f9819f 100644 --- a/DEPLOY.md +++ b/DEPLOY.md @@ -174,8 +174,9 @@ allow_registration = true allow_federation = true allow_check_for_updates = true -# Server to get public keys from. You probably shouldn't change this -trusted_servers = ["matrix.org"] +# Server to get public keys from. You probably shouldn't change this. +# Defaults to matrix.org if not provided. +#trusted_servers = ["matrix.org"] #max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time #log = "warn,state_res=warn,rocket=off,_=off,sled=off" diff --git a/conduit-example.toml b/conduit-example.toml index 836db654..5eab28ed 100644 --- a/conduit-example.toml +++ b/conduit-example.toml @@ -45,10 +45,11 @@ allow_check_for_updates = true enable_lightning_bolt = true # Servers listed here will be used to gather public keys of other servers. +# Defaults to matrix.org if not provided. # Generally, copying this exactly should be enough. (Currently, Conduit doesn't # support batched key requests, so this list should only contain Synapse # servers.) -trusted_servers = ["matrix.org"] +# trusted_servers = ["matrix.org"] #max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time #log = "warn,state_res=warn,rocket=off,_=off,sled=off"