Merge branch 'master' into nats

This commit is contained in:
Neil Alexander 2021-11-24 12:04:32 +00:00
commit 95476d36ca
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
28 changed files with 489 additions and 60 deletions

View file

@ -119,7 +119,7 @@ func main() {
}
cfg := config.Dendrite{}
cfg.Defaults()
cfg.Defaults(true)
cfg.Global.ServerName = "p2p"
cfg.Global.PrivateKey = privKey
cfg.Global.KeyID = gomatrixserverlib.KeyID(fmt.Sprintf("ed25519:%s", *instanceName))