mirror of
https://github.com/matrix-org/dendrite.git
synced 2026-03-03 17:03:10 -06:00
Only populate if not normalising
This commit is contained in:
parent
8a8f8552ab
commit
e19395eca7
|
|
@ -27,12 +27,6 @@ func main() {
|
|||
Generate: true,
|
||||
Monolithic: !*polylith,
|
||||
})
|
||||
} else {
|
||||
var err error
|
||||
if cfg, err = config.Load(*normalise, !*polylith); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
if *serverName != "" {
|
||||
cfg.Global.ServerName = gomatrixserverlib.ServerName(*serverName)
|
||||
}
|
||||
|
|
@ -84,6 +78,12 @@ func main() {
|
|||
EnableOutbound: true,
|
||||
}
|
||||
}
|
||||
} else {
|
||||
var err error
|
||||
if cfg, err = config.Load(*normalise, !*polylith); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
|
||||
j, err := yaml.Marshal(cfg)
|
||||
if err != nil {
|
||||
|
|
|
|||
Loading…
Reference in a new issue