mirror of
https://github.com/hoernschen/dendrite.git
synced 2024-12-27 07:28:27 +00:00
161f145176
* Add NATS JetStream support Update shopify/sarama * Fix addresses * Don't change Addresses in Defaults * Update saramajetstream * Add missing error check Keep typing events for at least one minute * Use all configured NATS addresses * Update saramajetstream * Try setting up with NATS * Make sure NATS uses own persistent directory (TODO: make this configurable) * Update go.mod/go.sum * Jetstream package * Various other refactoring * Build fixes * Config tweaks, make random jetstream storage path for CI * Disable interest policies * Try to sane default on jetstream base path * Try to use in-memory for CI * Restore storage/retention * Update nats.go dependency * Adapt changes to config * Remove unneeded TopicFor * Dep update * Revert "Remove unneeded TopicFor" This reverts commitf5a4e4a339
. * Revert changes made to streams * Fix build problems * Update nats-server * Update go.mod/go.sum * Roomserver input API queuing using NATS * Fix topic naming * Prometheus metrics * More refactoring to remove saramajetstream * Add missing topic * Don't try to populate map that doesn't exist * Roomserver output topic * Update go.mod/go.sum * Message acknowledgements * Ack tweaks * Try to resume transaction re-sends * Try to resume transaction re-sends * Update to matrix-org/gomatrixserverlib@91dadfb * Remove internal.PartitionStorer from components that don't consume keychanges * Try to reduce re-allocations a bit in resolveConflictsV2 * Tweak delivery options on RS input * Publish send-to-device messages into correct JetStream subject * Async and sync roomserver input * Update dendrite-config.yaml * Remove roomserver tests for now (they need rewriting) * Remove roomserver test again (was merged back in) * Update documentation * Docker updates * More Docker updates * Update Docker readme again * Fix lint issues * Send final event in `processEvent` synchronously (since this might stop Sytest from being so upset) * Don't report event rejection errors via `/send`, since apparently this is upsetting tests that don't expect that * Go 1.16 instead of Go 1.13 for upgrade tests and Complement * Revert "Don't report event rejection errors via `/send`, since apparently this is upsetting tests that don't expect that" This reverts commit368675283f
. * Don't report any errors on `/send` to see what fun that creates * Fix panics on closed channel sends * Enforce state key matches sender * Do the same for leave * Various tweaks to make tests happier Squashed commit of the following: commit13f9028e7a
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 15:47:14 2022 +0000 Do the same for leave commite6be7f05c3
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 15:33:42 2022 +0000 Enforce state key matches sender commit85ede6d64b
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 14:07:04 2022 +0000 Fix panics on closed channel sends commit9755494a98
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 13:38:22 2022 +0000 Don't report any errors on `/send` to see what fun that creates commit3bb4f87b5d
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 13:00:26 2022 +0000 Revert "Don't report event rejection errors via `/send`, since apparently this is upsetting tests that don't expect that" This reverts commit368675283f
. commitfe2673ed7b
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 12:09:34 2022 +0000 Go 1.16 instead of Go 1.13 for upgrade tests and Complement commit368675283f
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 11:51:45 2022 +0000 Don't report event rejection errors via `/send`, since apparently this is upsetting tests that don't expect that commitb028dfc085
Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 10:29:08 2022 +0000 Send final event in `processEvent` synchronously (since this might stop Sytest from being so upset) * Merge in NATS Server v2.6.6 and nats.go v1.13 into the in-process connection fork * Add `jetstream.WithJetStreamMessage` to make ack/nak-ing less messy, use process context in consumers * Fix consumer component name in federation API * Add comment explaining where streams are defined * Tweaks to roomserver input with comments * Finish that sentence that I apparently forgot to finish in INSTALL.md * Bump version number of config to 2 * Add comments around asynchronous sends to roomserver in processEventWithMissingState * More useful error message when the config version does not match * Set version in generate-config * Fix version in config.Defaults Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
101 lines
2.7 KiB
Go
101 lines
2.7 KiB
Go
package main
|
|
|
|
import (
|
|
"flag"
|
|
"fmt"
|
|
|
|
"github.com/matrix-org/dendrite/setup/config"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
"golang.org/x/crypto/bcrypt"
|
|
"gopkg.in/yaml.v2"
|
|
)
|
|
|
|
func main() {
|
|
defaultsForCI := flag.Bool("ci", false, "sane defaults for CI testing")
|
|
serverName := flag.String("server", "", "The domain name of the server if not 'localhost'")
|
|
dbURI := flag.String("db", "", "The DB URI to use for all components if not SQLite files")
|
|
flag.Parse()
|
|
|
|
cfg := &config.Dendrite{
|
|
Version: config.Version,
|
|
}
|
|
cfg.Defaults(true)
|
|
if *serverName != "" {
|
|
cfg.Global.ServerName = gomatrixserverlib.ServerName(*serverName)
|
|
}
|
|
if *dbURI != "" {
|
|
cfg.AppServiceAPI.Database.ConnectionString = config.DataSource(*dbURI)
|
|
cfg.FederationAPI.Database.ConnectionString = config.DataSource(*dbURI)
|
|
cfg.KeyServer.Database.ConnectionString = config.DataSource(*dbURI)
|
|
cfg.MSCs.Database.ConnectionString = config.DataSource(*dbURI)
|
|
cfg.MediaAPI.Database.ConnectionString = config.DataSource(*dbURI)
|
|
cfg.RoomServer.Database.ConnectionString = config.DataSource(*dbURI)
|
|
cfg.SyncAPI.Database.ConnectionString = config.DataSource(*dbURI)
|
|
cfg.UserAPI.AccountDatabase.ConnectionString = config.DataSource(*dbURI)
|
|
cfg.UserAPI.DeviceDatabase.ConnectionString = config.DataSource(*dbURI)
|
|
}
|
|
cfg.Global.TrustedIDServers = []string{
|
|
"matrix.org",
|
|
"vector.im",
|
|
}
|
|
cfg.Logging = []config.LogrusHook{
|
|
{
|
|
Type: "file",
|
|
Level: "info",
|
|
Params: map[string]interface{}{
|
|
"path": "/var/log/dendrite",
|
|
},
|
|
},
|
|
}
|
|
cfg.FederationAPI.KeyPerspectives = config.KeyPerspectives{
|
|
{
|
|
ServerName: "matrix.org",
|
|
Keys: []config.KeyPerspectiveTrustKey{
|
|
{
|
|
KeyID: "ed25519:auto",
|
|
PublicKey: "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw",
|
|
},
|
|
{
|
|
KeyID: "ed25519:a_RXGa",
|
|
PublicKey: "l8Hft5qXKn1vfHrg3p4+W8gELQVo8N13JkluMfmn2sQ",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
cfg.MediaAPI.ThumbnailSizes = []config.ThumbnailSize{
|
|
{
|
|
Width: 32,
|
|
Height: 32,
|
|
ResizeMethod: "crop",
|
|
},
|
|
{
|
|
Width: 96,
|
|
Height: 96,
|
|
ResizeMethod: "crop",
|
|
},
|
|
{
|
|
Width: 640,
|
|
Height: 480,
|
|
ResizeMethod: "scale",
|
|
},
|
|
}
|
|
|
|
if *defaultsForCI {
|
|
cfg.AppServiceAPI.DisableTLSValidation = true
|
|
cfg.ClientAPI.RateLimiting.Enabled = false
|
|
cfg.FederationAPI.DisableTLSValidation = true
|
|
// don't hit matrix.org when running tests!!!
|
|
cfg.FederationAPI.KeyPerspectives = config.KeyPerspectives{}
|
|
cfg.MSCs.MSCs = []string{"msc2836", "msc2946", "msc2444", "msc2753"}
|
|
cfg.Logging[0].Level = "trace"
|
|
cfg.UserAPI.BCryptCost = bcrypt.MinCost
|
|
cfg.Global.JetStream.InMemory = true
|
|
}
|
|
|
|
j, err := yaml.Marshal(cfg)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
fmt.Println(string(j))
|
|
}
|