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 /cmd | |
| 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 'cmd')
| -rw-r--r-- | cmd/dendrite-demo-libp2p/main.go | 2 | ||||
| -rw-r--r-- | cmd/dendrite-demo-pinecone/main.go | 2 | ||||
| -rw-r--r-- | cmd/dendrite-demo-yggdrasil/main.go | 2 | ||||
| -rw-r--r-- | cmd/dendritejs-pinecone/main.go | 2 | ||||
| -rw-r--r-- | cmd/dendritejs/main.go | 2 | ||||
| -rw-r--r-- | cmd/generate-config/main.go | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/cmd/dendrite-demo-libp2p/main.go b/cmd/dendrite-demo-libp2p/main.go index 6a1428d5..d518d158 100644 --- a/cmd/dendrite-demo-libp2p/main.go +++ b/cmd/dendrite-demo-libp2p/main.go @@ -119,7 +119,7 @@ func main() { } cfg := config.Dendrite{} - cfg.Defaults() + cfg.Defaults(true) cfg.Global.ServerName = "p2p" cfg.Global.PrivateKey = privKey cfg.Global.KeyID = gomatrixserverlib.KeyID(fmt.Sprintf("ed25519:%s", *instanceName)) diff --git a/cmd/dendrite-demo-pinecone/main.go b/cmd/dendrite-demo-pinecone/main.go index 9afa53a6..2b56ef35 100644 --- a/cmd/dendrite-demo-pinecone/main.go +++ b/cmd/dendrite-demo-pinecone/main.go @@ -142,7 +142,7 @@ func main() { } 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/cmd/dendrite-demo-yggdrasil/main.go b/cmd/dendrite-demo-yggdrasil/main.go index 2663aabb..1e0a7d03 100644 --- a/cmd/dendrite-demo-yggdrasil/main.go +++ b/cmd/dendrite-demo-yggdrasil/main.go @@ -73,7 +73,7 @@ func main() { */ 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) diff --git a/cmd/dendritejs-pinecone/main.go b/cmd/dendritejs-pinecone/main.go index a430f82a..10ba0717 100644 --- a/cmd/dendritejs-pinecone/main.go +++ b/cmd/dendritejs-pinecone/main.go @@ -161,7 +161,7 @@ func startup() { pSessions := pineconeSessions.NewSessions(logger, pRouter) cfg := &config.Dendrite{} - cfg.Defaults() + cfg.Defaults(true) cfg.UserAPI.AccountDatabase.ConnectionString = "file:/idb/dendritejs_account.db" cfg.AppServiceAPI.Database.ConnectionString = "file:/idb/dendritejs_appservice.db" cfg.UserAPI.DeviceDatabase.ConnectionString = "file:/idb/dendritejs_device.db" diff --git a/cmd/dendritejs/main.go b/cmd/dendritejs/main.go index 9bb1f24e..96958116 100644 --- a/cmd/dendritejs/main.go +++ b/cmd/dendritejs/main.go @@ -164,7 +164,7 @@ func createP2PNode(privKey ed25519.PrivateKey) (serverName string, node *go_http func main() { cfg := &config.Dendrite{} - cfg.Defaults() + cfg.Defaults(true) cfg.UserAPI.AccountDatabase.ConnectionString = "file:/idb/dendritejs_account.db" cfg.AppServiceAPI.Database.ConnectionString = "file:/idb/dendritejs_appservice.db" cfg.UserAPI.DeviceDatabase.ConnectionString = "file:/idb/dendritejs_device.db" diff --git a/cmd/generate-config/main.go b/cmd/generate-config/main.go index a0407b73..ff91e753 100644 --- a/cmd/generate-config/main.go +++ b/cmd/generate-config/main.go @@ -17,7 +17,7 @@ func main() { flag.Parse() cfg := &config.Dendrite{} - cfg.Defaults() + cfg.Defaults(true) if *serverName != "" { cfg.Global.ServerName = gomatrixserverlib.ServerName(*serverName) } |