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

@ -50,7 +50,7 @@ const (
// Generates new matrix and TLS keys for the server.
func MakeConfig(configDir, kafkaURI, database, host string, startPort int) (*config.Dendrite, int, error) {
var cfg config.Dendrite
cfg.Defaults()
cfg.Defaults(true)
port := startPort
assignAddress := func() config.HTTPAddress {