Merge branch 'trusted' into 'master'

fix: add trusted_servers to config and deploy guide

See merge request famedly/conduit!74

DEPLOY.md

@@ -96,6 +96,8 @@ # Note: existing rooms will continue to work
 allow_encryption = true
 allow_federation = true
 
+trusted_servers = ["matrix.org"]
+
 #cache_capacity = 1073741824 # in bytes, 1024 * 1024 * 1024
 #max_concurrent_requests = 4 # How many requests Conduit sends to other servers at the same time
 #workers = 4 # default: cpu core count * 2

conduit-example.toml

@@ -33,6 +33,8 @@ max_request_size = 20_000_000 # in bytes
 # Enable jaeger to support monitoring and troubleshooting through jaeger
 #allow_jaeger = false
 
+trusted_servers = ["matrix.org"]
+
 #cache_capacity = 1073741824 # in bytes, 1024 * 1024 * 1024
 #max_concurrent_requests = 4 # How many requests Conduit sends to other servers at the same time
 #log = "info,state_res=warn,rocket=off,_=off,sled=off"