diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-09-01 14:15:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-01 14:15:41 +0100 |
| commit | 51d229b02505df770ed891ec8ab20843bc2b1d1d (patch) | |
| tree | 24fe6f8ba56b8e59226574f0b2971c24418ba44b /cmd/dendrite-demo-yggdrasil | |
| parent | ad6b902b8462adb568d799c69a74b60d69574d0c (diff) | |
Configuration tweaks (#2567)
This makes the following changes:
* The various `Defaults` functions are now responsible for setting sane defaults if `generate` is specified, rather than hiding them in `generate-config`
* Some configuration options have been marked as `omitempty` so that they don't appear in generated configs unnecessarily (monolith-specific vs. polylith-specific options)
* A new option `-polylith` has been added to `generate-config` to create a config that makes sense for polylith deployments (i.e. including the internal/external API listeners and per-component database sections)
* A new option `-normalise` has been added to `generate-config` to take an existing file and add any missing options and/or defaults
Diffstat (limited to 'cmd/dendrite-demo-yggdrasil')
| -rw-r--r-- | cmd/dendrite-demo-yggdrasil/main.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd/dendrite-demo-yggdrasil/main.go b/cmd/dendrite-demo-yggdrasil/main.go index 086baa26..d2fddf8b 100644 --- a/cmd/dendrite-demo-yggdrasil/main.go +++ b/cmd/dendrite-demo-yggdrasil/main.go @@ -78,7 +78,10 @@ func main() { if configFlagSet { cfg = setup.ParseFlags(true) } else { - cfg.Defaults(true) + cfg.Defaults(config.DefaultOpts{ + Generate: true, + Monolithic: true, + }) cfg.Global.JetStream.StoragePath = config.Path(fmt.Sprintf("%s/", *instanceName)) cfg.UserAPI.AccountDatabase.ConnectionString = config.DataSource(fmt.Sprintf("file:%s-account.db", *instanceName)) cfg.MediaAPI.Database.ConnectionString = config.DataSource(fmt.Sprintf("file:%s-mediaapi.db", *instanceName)) |