From 5fdb33e2c02137ed1637e0871225dbca06f5e1b1 Mon Sep 17 00:00:00 2001 From: Jade Ellis Date: Sat, 18 Jan 2025 18:45:31 +0000 Subject: [PATCH] generate example config --- conduwuit-example.toml | 12 ++++++++++++ src/core/config/mod.rs | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/conduwuit-example.toml b/conduwuit-example.toml index 4062ba99..7040e8b2 100644 --- a/conduwuit-example.toml +++ b/conduwuit-example.toml @@ -1160,6 +1160,8 @@ # Vector list of servers that conduwuit will refuse to download remote # media from. # +# This is in addition to `forbidden_remote_server_names`. +# #prevent_media_downloads_from = [] # List of forbidden server names that we will block incoming AND outgoing @@ -1169,14 +1171,24 @@ # sender user's server name, inbound federation X-Matrix origin, and # outbound federation handler. # +# Additionally, it will hide messages from these servers for all users +# on this server. +# # Basically "global" ACLs. # #forbidden_remote_server_names = [] +# The inverse of `forbidden_remote_server_names`. By default, allows all +# servers. `forbidden_remote_server_names` takes precedence. +# +#allowed_remote_server_names = [] + # List of forbidden server names that we will block all outgoing federated # room directory requests for. Useful for preventing our users from # wandering into bad servers or spaces. # +# This is in addition to `forbidden_remote_server_names`. +# #forbidden_remote_room_directory_server_names = [] # Vector list of IPv4 and IPv6 CIDR ranges / subnets *in quotes* that you diff --git a/src/core/config/mod.rs b/src/core/config/mod.rs index b1ad4562..e9fc4a36 100644 --- a/src/core/config/mod.rs +++ b/src/core/config/mod.rs @@ -1347,7 +1347,7 @@ pub struct Config { pub forbidden_remote_server_names: HashSet, /// The inverse of `forbidden_remote_server_names`. By default, allows all - /// servers. `forbidden_remote_server_names` takes precidence. + /// servers. `forbidden_remote_server_names` takes precedence. /// /// default: [] #[serde(default)]