MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-29 11:14:24 +01:00
Code Issues Releases Activity

Merge branch 'trusted' into 'master'

Browse source 
fix: add trusted_servers to config and deploy guide

See merge request famedly/conduit!74
This commit is contained in:
Timo Kösters 2021-05-05 10:42:55 +00:00
commit bd16850fd4
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DEPLOY.md
View file

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

2
conduit-example.toml
View file

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