mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-26 00:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into hs/fix-as-exclusive

Browse source
This commit is contained in:
Will Hunt 2020-12-18 01:03:10 +00:00 committed by GitHub
parent 67ab81b866 a518e2971a
commit 07967477fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/generate-config/main.go
View file

@ -65,6 +65,8 @@ func main() {
cfg.FederationSender.DisableTLSValidation = true cfg.FederationSender.DisableTLSValidation = true
cfg.MSCs.MSCs = []string{"msc2836"} cfg.MSCs.MSCs = []string{"msc2836"}
cfg.Logging[0].Level = "trace" cfg.Logging[0].Level = "trace"
// don't hit matrix.org when running tests!!!
cfg.SigningKeyServer.KeyPerspectives = config.KeyPerspectives{}
} }
j, err := yaml.Marshal(cfg) j, err := yaml.Marshal(cfg)