hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-10-10 03:32:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into nats

Browse source
This commit is contained in:
Neil Alexander 2021-11-24 12:04:32 +00:00
commit 95476d36ca
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
28 changed files with 489 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/dendrite-demo-libp2p/main.go
View file

@ -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))

2
cmd/dendrite-demo-pinecone/main.go
View file

@ -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)

2
cmd/dendrite-demo-yggdrasil/main.go
View file

@ -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)

2
cmd/dendritejs-pinecone/main.go
View file

@ -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"

2
cmd/dendritejs/main.go
View file

@ -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"

2
cmd/generate-config/main.go
View file

@ -17,7 +17,7 @@ func main() {
flag.Parse()
cfg := &config.Dendrite{}
cfg.Defaults()
cfg.Defaults(true)
if *serverName != "" {
cfg.Global.ServerName = gomatrixserverlib.ServerName(*serverName)
}