From 31102a43c5cf7c06367a8fca335abc3541332434 Mon Sep 17 00:00:00 2001 From: mikoto Date: Mon, 10 Jun 2024 18:22:20 +0200 Subject: [PATCH] docs --- conduit-example.toml | 8 +++++--- docs/configuration.md | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/conduit-example.toml b/conduit-example.toml index 558e62ab..db0aa43a 100644 --- a/conduit-example.toml +++ b/conduit-example.toml @@ -42,7 +42,7 @@ allow_registration = true # an account. YOU NEED TO EDIT THIS. # - Insert a password that users will have to enter on registration # - Start the line with '#' to remove the condition -# registration_token = "" +registration_token = "" allow_check_for_updates = true allow_federation = true @@ -56,9 +56,11 @@ enable_lightning_bolt = true # servers.) trusted_servers = ["matrix.org"] -#max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time +# Rooms listed here will be joined automatically after registration. +# See examples for accepted identifiers. +#join_by_default = ["#lounge:conduit.rs", "#lounge", "lounge", "!abc123:conduit.rs", "!abc123"] -join_by_default = ["home", "!oN47OFomZSVRQVCLLw"] +#max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time # Controls the log verbosity. See also [here][0]. # diff --git a/docs/configuration.md b/docs/configuration.md index d903a21e..edc924f1 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -44,6 +44,7 @@ The `global` section contains the following fields: | `allow_room_creation` | `boolean` | Allow users to create rooms | `true` | | `allow_unstable_room_versions` | `boolean` | Allow users to create and join rooms with unstable versions | `true` | | `default_room_version` | `string` | The default room version (`"6"`-`"10"`)| `"10"` | +| `join_by_default` | `array` | Room aliases and IDs that will be joined by default at registration | N/A | | `allow_jaeger` | `boolean` | Allow Jaeger tracing | `false` | | `tracing_flame` | `boolean` | Enable flame tracing | `false` | | `proxy` | `table` | See the [Proxy configuration](#proxy) | N/A |