From 247b372ad6cc3fbcf7df368ab5b12442b08584b2 Mon Sep 17 00:00:00 2001 From: Jonas Zohren Date: Sun, 18 Jul 2021 22:20:17 +0200 Subject: [PATCH] Cleanup test-config.toml comments --- tests/test-config.toml | 44 ++++++------------------------------------ 1 file changed, 6 insertions(+), 38 deletions(-) diff --git a/tests/test-config.toml b/tests/test-config.toml index badc6eb..c466687 100644 --- a/tests/test-config.toml +++ b/tests/test-config.toml @@ -1,47 +1,15 @@ [global] -# The server_name is the name of this server. It is used as a suffix for user -# and room ids. Examples: matrix.org, conduit.rs -# The Conduit server needs to be reachable at https://your.server.name/ on port -# 443 (client-server) and 8448 (federation) OR you can create /.well-known -# files to redirect requests. See -# https://matrix.org/docs/spec/client_server/latest#get-well-known-matrix-client -# and https://matrix.org/docs/spec/server_server/r0.1.4#get-well-known-matrix-server -# for more information -# YOU NEED TO EDIT THIS +# Server runs in same container as tests do, so localhost is fine server_name = "localhost" -# This is the only directory where Conduit will save its data +# With a bit of luck /tmp is a RAM disk, so that the file system does not become the bottleneck while testing database_path = "/tmp" -# The port Conduit will be running on. You need to set up a reverse proxy in -# your web server (e.g. apache or nginx), so all requests to /_matrix on port -# 443 and 8448 will be forwarded to the Conduit instance running on this port +# All the other settings are left at their defaults: port = 6167 - -# Max size for uploads -max_request_size = 20_000_000 # in bytes - -# Disable registration. No new users will be able to register on this server +max_request_size = 20_000_000 allow_registration = true - -# Disable encryption, so no new encrypted rooms can be created -# Note: existing rooms will continue to work -#allow_encryption = false -#allow_federation = false - -# Enable jaeger to support monitoring and troubleshooting through jaeger -#allow_jaeger = false - trusted_servers = ["matrix.org"] - -#max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time -#log = "info,state_res=warn,rocket=off,_=off,sled=off" -#workers = 4 # default: cpu core count * 2 - -address = "127.0.0.1" # This makes sure Conduit can only be reached using the reverse proxy - -proxy = "none" # more examples can be found at src/database/proxy.rs:6 - -# The total amount of memory that the database will use. -#db_cache_capacity_mb = 200 \ No newline at end of file +address = "127.0.0.1" +proxy = "none" \ No newline at end of file