Matthias/conduit
1
0
Fork 0
Code Issues 179 Pull requests 44 Projects Releases 5 Packages Wiki Activity

Document that matrix.org is the default notary server #976

Open
_ZN3val wants to merge 1 commit from morg-notary into next
pull from: morg-notary
merge into: Matthias:next
Conversation 1 Commits 1 Files changed 2 +5 -3
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
DEPLOY.md
View file

@ -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"

3
conduit-example.toml
View file

@ -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"