dolysis/conduwuit
3
0
Fork 0
mirror of https://github.com/girlbossceo/conduwuit.git synced 2024-11-27 20:45:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'trust' into 'next'

Browse source 
improvement: matrix.org is default trusted server if unspecified

See merge request famedly/conduit!536
This commit is contained in:
Timo Kösters 2023-08-10 15:50:16 +00:00
parent 9db87550fd 19bfee1835
commit b7b2eb9d05
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/config/mod.rs
View file

@ -65,7 +65,7 @@ pub struct Config {
#[serde(default)]
pub proxy: ProxyConfig,
pub jwt_secret: Option<String>,
#[serde(default = "Vec::new")]
#[serde(default = "default_trusted_servers")]
pub trusted_servers: Vec<OwnedServerName>,
#[serde(default = "default_log")]
pub log: String,
@ -259,6 +259,10 @@ fn default_max_fetch_prev_events() -> u16 {
100_u16
}
fn default_trusted_servers() -> Vec<OwnedServerName> {
vec![OwnedServerName::try_from("matrix.org").unwrap()]
}
fn default_log() -> String {
"warn,state_res=warn,_=off,sled=off".to_owned()
}