mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-03-03 17:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Try again

Browse source
This commit is contained in:
Neil Alexander 2022-08-31 10:14:32 +01:00
parent 804c3bf9e3
commit 6edfc1cb22
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -91,7 +91,7 @@ func main() {
keyfile := *instanceName + ".pem" keyfile := *instanceName + ".pem"
if _, err := os.Stat(keyfile); os.IsNotExist(err) { if _, err := os.Stat(keyfile); os.IsNotExist(err) {
oldkeyfile := *instanceName + ".key" oldkeyfile := *instanceName + ".key"
if _, err := os.Stat(oldkeyfile); os.IsNotExist(err) { if _, err = os.Stat(oldkeyfile); os.IsNotExist(err) {
if err = test.NewMatrixKey(keyfile); err != nil { if err = test.NewMatrixKey(keyfile); err != nil {
panic("failed to generate a new PEM key: " + err.Error()) panic("failed to generate a new PEM key: " + err.Error())
} }
@ -106,12 +106,13 @@ func main() {
panic("failed to convert the private key to PEM format: " + err.Error()) panic("failed to convert the private key to PEM format: " + err.Error())
} }
} }
} else {
var err error
if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
panic(err)
}
} }
var err error
cfg.Defaults(true) cfg.Defaults(true)
if _, sk, err = config.LoadMatrixKey(keyfile, os.ReadFile); err != nil {
panic(err)
}
cfg.Global.PrivateKey = sk cfg.Global.PrivateKey = sk
cfg.Global.JetStream.StoragePath = config.Path(fmt.Sprintf("%s/", *instanceName)) cfg.Global.JetStream.StoragePath = config.Path(fmt.Sprintf("%s/", *instanceName))
cfg.UserAPI.AccountDatabase.ConnectionString = config.DataSource(fmt.Sprintf("file:%s-account.db", *instanceName)) cfg.UserAPI.AccountDatabase.ConnectionString = config.DataSource(fmt.Sprintf("file:%s-account.db", *instanceName))