diff options
| author | Brendan Abolivier <contact@brendanabolivier.com> | 2017-09-11 19:18:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-11 19:18:19 +0100 |
| commit | f1fce55697df421af3840edce4e60071adf0e818 (patch) | |
| tree | 024376ed2b4e1b836cd2bd32fb698cb18b20a594 /dendrite-config.yaml | |
| parent | 28346b39e8e6d666442b00fed79a07e695046855 (diff) | |
Add config and checks for trusted ID servers (#206)
* Add config for trusted ID servers
* Add new error
* Implement check for trusted ID server
* Complete unfinished comment
* Make comment more explicit in the config file
* Use go standard errors in membership.go
* Use standard errors instead of JSON responses in threepid
* Doc errors
* Remove unused parameter
Diffstat (limited to 'dendrite-config.yaml')
| -rw-r--r-- | dendrite-config.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dendrite-config.yaml b/dendrite-config.yaml index a91429c2..c9cab73e 100644 --- a/dendrite-config.yaml +++ b/dendrite-config.yaml @@ -12,6 +12,12 @@ matrix: private_key: "/etc/dendrite/matrix_key.pem" # The x509 certificates used by the federation listeners for this server federation_certificates: ["/etc/dendrite/server.pem"] + # The list of identity servers trusted to verify third party identifiers by this server. + # Defaults to no trusted servers. + trusted_third_party_id_servers: + - vector.im + - matrix.org + - riot.im # The media repository config media: |