diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2021-11-24 11:57:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-24 11:57:39 +0000 |
| commit | c9419e51afeb0c8cb39a43bd8a0d0d472347a8a1 (patch) | |
| tree | 7b425f81fe82f73c80857799a35d0ad6a004db4a /build | |
| parent | ec716793eb86e7723ecfaa356e148334bc3921eb (diff) | |
Don't populate config defaults where it doesn't make sense (#2058)
* Don't populate config defaults where it doesn't make sense
* Fix dendritejs builds
Diffstat (limited to 'build')
| -rw-r--r-- | build/gobind-pinecone/monolith.go | 2 | ||||
| -rw-r--r-- | build/gobind-yggdrasil/monolith.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/gobind-pinecone/monolith.go b/build/gobind-pinecone/monolith.go index 46fe24ce..47ca20db 100644 --- a/build/gobind-pinecone/monolith.go +++ b/build/gobind-pinecone/monolith.go @@ -260,7 +260,7 @@ func (m *DendriteMonolith) Start() { prefix := hex.EncodeToString(pk) cfg := &config.Dendrite{} - cfg.Defaults() + cfg.Defaults(true) cfg.Global.ServerName = gomatrixserverlib.ServerName(hex.EncodeToString(pk)) cfg.Global.PrivateKey = sk cfg.Global.KeyID = gomatrixserverlib.KeyID(signing.KeyID) diff --git a/build/gobind-yggdrasil/monolith.go b/build/gobind-yggdrasil/monolith.go index fcfb7a25..bde9fbdf 100644 --- a/build/gobind-yggdrasil/monolith.go +++ b/build/gobind-yggdrasil/monolith.go @@ -82,7 +82,7 @@ func (m *DendriteMonolith) Start() { m.YggdrasilNode = ygg cfg := &config.Dendrite{} - cfg.Defaults() + cfg.Defaults(true) cfg.Global.ServerName = gomatrixserverlib.ServerName(ygg.DerivedServerName()) cfg.Global.PrivateKey = ygg.PrivateKey() cfg.Global.KeyID = gomatrixserverlib.KeyID(signing.KeyID) |