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

Only populate if not normalising

Browse source
This commit is contained in:
Neil Alexander 2022-09-01 10:34:21 +01:00
parent 8a8f8552ab
commit e19395eca7
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,12 +27,6 @@ func main() {
Generate: true, Generate: true,
Monolithic: !*polylith, Monolithic: !*polylith,
}) })
} else {
var err error
if cfg, err = config.Load(*normalise, !*polylith); err != nil {
panic(err)
}
}
if *serverName != "" { if *serverName != "" {
cfg.Global.ServerName = gomatrixserverlib.ServerName(*serverName) cfg.Global.ServerName = gomatrixserverlib.ServerName(*serverName)
} }
@ -84,6 +78,12 @@ func main() {
EnableOutbound: true, EnableOutbound: true,
} }
} }
} else {
var err error
if cfg, err = config.Load(*normalise, !*polylith); err != nil {
panic(err)
}
}
j, err := yaml.Marshal(cfg) j, err := yaml.Marshal(cfg)
if err != nil { if err != nil {