mirror of
https://gitlab.com/famedly/conduit.git
synced 2024-12-25 19:34:39 +01:00
Merge branch 'trust' into 'next'
improvement: matrix.org is default trusted server if unspecified See merge request famedly/conduit!536
This commit is contained in:
commit
b7b2eb9d05
1 changed files with 5 additions and 1 deletions
|
@ -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()
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue