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 /build/gobind-pinecone | |
| 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 'build/gobind-pinecone')
| -rw-r--r-- | build/gobind-pinecone/monolith.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/gobind-pinecone/monolith.go b/build/gobind-pinecone/monolith.go index 60e81721..44eab4cd 100644 --- a/build/gobind-pinecone/monolith.go +++ b/build/gobind-pinecone/monolith.go @@ -243,7 +243,10 @@ func (m *DendriteMonolith) Start() { prefix := hex.EncodeToString(pk) cfg := &config.Dendrite{} - cfg.Defaults(true) + cfg.Defaults(config.DefaultOpts{ + Generate: true, + Monolithic: true, + }) cfg.Global.ServerName = gomatrixserverlib.ServerName(hex.EncodeToString(pk)) cfg.Global.PrivateKey = sk cfg.Global.KeyID = gomatrixserverlib.KeyID(signing.KeyID) |