aboutsummaryrefslogtreecommitdiff
path: root/setup/config
diff options
context:
space:
mode:
authorJonathan Bartlett <34320158+Jonnobrow@users.noreply.github.com>2022-07-25 10:39:57 +0100
committerGitHub <noreply@github.com>2022-07-25 10:39:57 +0100
commitb836243a24b7928d9986c97d0ae66be57f71ab42 (patch)
tree4e28059fd1815725ad6fa7a435015834e43c3d59 /setup/config
parent081f5e722677fc0306934a814c557b57d56c2e0d (diff)
Add .well-known/matrix/client to clientapi (#2551)
Signed-off-by: Jonathan Bartlett <jonathan@jonnobrow.co.uk> Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
Diffstat (limited to 'setup/config')
-rw-r--r--setup/config/config_global.go3
-rw-r--r--setup/config/config_test.go1
2 files changed, 4 insertions, 0 deletions
diff --git a/setup/config/config_global.go b/setup/config/config_global.go
index 10827bb2..d4e54e20 100644
--- a/setup/config/config_global.go
+++ b/setup/config/config_global.go
@@ -46,6 +46,9 @@ type Global struct {
// The server name to delegate server-server communications to, with optional port
WellKnownServerName string `yaml:"well_known_server_name"`
+ // The server name to delegate client-server communications to, with optional port
+ WellKnownClientName string `yaml:"well_known_client_name"`
+
// Disables federation. Dendrite will not be able to make any outbound HTTP requests
// to other servers and the federation API will not be exposed.
DisableFederation bool `yaml:"disable_federation"`
diff --git a/setup/config/config_test.go b/setup/config/config_test.go
index b9b1e7bb..ee7e7389 100644
--- a/setup/config/config_test.go
+++ b/setup/config/config_test.go
@@ -42,6 +42,7 @@ global:
key_id: ed25519:auto
key_validity_period: 168h0m0s
well_known_server_name: "localhost:443"
+ well_known_client_name: "localhost:443"
trusted_third_party_id_servers:
- matrix.org
- vector.im