oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-08-06 17:40:59 +00:00
Code Wiki Activity

re-add well-known table, while still allowing individual values to be set with env vars without double underscores

Browse source
This commit is contained in:
Matthias Ahouansou 2024-10-10 16:02:39 +01:00
parent a9ff97e527
commit de323cbecb
No known key found for this signature in database
4 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/config/mod.rs
View file

@ -59,7 +59,7 @@ pub struct Config {
pub allow_unstable_room_versions: bool,
#[serde(default = "default_default_room_version")]
pub default_room_version: RoomVersionId,
#[serde(default, flatten)]
#[serde(default)]
pub well_known: WellKnownConfig,
#[serde(default = "false_fn")]
pub allow_jaeger: bool,
@ -97,9 +97,7 @@ pub struct TlsConfig {
#[derive(Clone, Debug, Deserialize, Default)]
pub struct WellKnownConfig {
#[serde(rename = "well_known_client")]
pub client: Option<Url>,
#[serde(rename = "well_known_server")]
pub server: Option<OwnedServerName>,
}