aboutsummaryrefslogtreecommitdiff
path: root/dendrite-config.yaml
diff options
context:
space:
mode:
authorS7evinK <tfaelligen@gmail.com>2022-01-05 18:44:49 +0100
committerGitHub <noreply@github.com>2022-01-05 17:44:49 +0000
commit161f14517669410d3e8207dc41eea5c9695f7e17 (patch)
tree20db8ed83d92c688206242f84880ff2e35a1d5eb /dendrite-config.yaml
parenta47b12dc7d692e0ddd4aaa0801dafc9bb462aad9 (diff)
Add NATS JetStream support (#1866)
* 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 commit f5a4e4a339b6f94ec215778dca22204adaa893d1. * 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 commit 368675283fc44501f227639811bdb16dd5deef8c. * 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: commit 13f9028e7a63662759ce7c55504a9d2423058668 Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 15:47:14 2022 +0000 Do the same for leave commit e6be7f05c349fafbdddfe818337a17a60c867be1 Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 15:33:42 2022 +0000 Enforce state key matches sender commit 85ede6d64bf10ce9b91cdd6d80f87350ee55242f Author: Neil Alexander <neilalexander@users.noreply.github.com> Date: Tue Jan 4 14:07:04 2022 +0000 Fix panics on closed channel sends commit 9755494a98bed62450f8001d8128e40481d27e15 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 commit 3bb4f87b5dd56882febb4db5621db484c8789b7c 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 commit 368675283fc44501f227639811bdb16dd5deef8c. commit fe2673ed7be9559eaca134424e403a4faca100b0 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 commit 368675283fc44501f227639811bdb16dd5deef8c 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 commit b028dfc08577bcf52e6cb498026e15fa5d46d07c 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>
Diffstat (limited to 'dendrite-config.yaml')
-rw-r--r--dendrite-config.yaml79
1 files changed, 36 insertions, 43 deletions
diff --git a/dendrite-config.yaml b/dendrite-config.yaml
index bf3811a2..7593988f 100644
--- a/dendrite-config.yaml
+++ b/dendrite-config.yaml
@@ -28,7 +28,7 @@
# connection can be idle in seconds - a negative value is unlimited.
# The version of the configuration file.
-version: 1
+version: 2
# Global Matrix configuration. This configuration applies to all components.
global:
@@ -68,34 +68,27 @@ global:
# to other servers and the federation API will not be exposed.
disable_federation: false
- # Configuration for Kafka/Naffka.
- kafka:
- # List of Kafka broker addresses to connect to. This is not needed if using
- # Naffka in monolith mode.
+ # Configuration for NATS JetStream
+ jetstream:
+ # A list of NATS Server addresses to connect to. If none are specified, an
+ # internal NATS server will be started automatically when running Dendrite
+ # in monolith mode. It is required to specify the address of at least one
+ # NATS Server node if running in polylith mode.
addresses:
- - localhost:2181
+ # - localhost:4222
- # The prefix to use for Kafka topic names for this homeserver. Change this only if
- # you are running more than one Dendrite homeserver on the same Kafka deployment.
- topic_prefix: Dendrite
-
- # Whether to use Naffka instead of Kafka. This is only available in monolith
- # mode, but means that you can run a single-process server without requiring
- # Kafka.
- use_naffka: true
+ # Keep all NATS streams in memory, rather than persisting it to the storage
+ # path below. This option is present primarily for integration testing and
+ # should not be used on a real world Dendrite deployment.
+ in_memory: false
- # The max size a Kafka message is allowed to use.
- # You only need to change this value, if you encounter issues with too large messages.
- # Must be less than/equal to "max.message.bytes" configured in Kafka.
- # Defaults to 8388608 bytes.
- # max_message_bytes: 8388608
+ # Persistent directory to store JetStream streams in. This directory
+ # should be preserved across Dendrite restarts.
+ storage_path: ./
- # Naffka database options. Not required when using Kafka.
- naffka_database:
- connection_string: file:naffka.db
- max_open_conns: 10
- max_idle_conns: 2
- conn_max_lifetime: -1
+ # The prefix to use for stream names for this homeserver - really only
+ # useful if running more than one Dendrite on the same NATS deployment.
+ topic_prefix: Dendrite
# Configuration for Prometheus metric collection.
metrics:
@@ -121,8 +114,8 @@ global:
# Configuration for the Appservice API.
app_service_api:
internal_api:
- listen: http://localhost:7777
- connect: http://localhost:7777
+ listen: http://localhost:7777 # Only used in polylith deployments
+ connect: http://localhost:7777 # Only used in polylith deployments
database:
connection_string: file:appservice.db
max_open_conns: 10
@@ -140,8 +133,8 @@ app_service_api:
# Configuration for the Client API.
client_api:
internal_api:
- listen: http://localhost:7771
- connect: http://localhost:7771
+ listen: http://localhost:7771 # Only used in polylith deployments
+ connect: http://localhost:7771 # Only used in polylith deployments
external_api:
listen: http://[::]:8071
@@ -181,14 +174,14 @@ client_api:
# Configuration for the EDU server.
edu_server:
internal_api:
- listen: http://localhost:7778
- connect: http://localhost:7778
+ listen: http://localhost:7778 # Only used in polylith deployments
+ connect: http://localhost:7778 # Only used in polylith deployments
# Configuration for the Federation API.
federation_api:
internal_api:
- listen: http://localhost:7772
- connect: http://localhost:7772
+ listen: http://localhost:7772 # Only used in polylith deployments
+ connect: http://localhost:7772 # Only used in polylith deployments
external_api:
listen: http://[::]:8072
database:
@@ -237,8 +230,8 @@ federation_api:
# Configuration for the Key Server (for end-to-end encryption).
key_server:
internal_api:
- listen: http://localhost:7779
- connect: http://localhost:7779
+ listen: http://localhost:7779 # Only used in polylith deployments
+ connect: http://localhost:7779 # Only used in polylith deployments
database:
connection_string: file:keyserver.db
max_open_conns: 10
@@ -248,8 +241,8 @@ key_server:
# Configuration for the Media API.
media_api:
internal_api:
- listen: http://localhost:7774
- connect: http://localhost:7774
+ listen: http://localhost:7774 # Only used in polylith deployments
+ connect: http://localhost:7774 # Only used in polylith deployments
external_api:
listen: http://[::]:8074
database:
@@ -300,8 +293,8 @@ mscs:
# Configuration for the Room Server.
room_server:
internal_api:
- listen: http://localhost:7770
- connect: http://localhost:7770
+ listen: http://localhost:7770 # Only used in polylith deployments
+ connect: http://localhost:7770 # Only used in polylith deployments
database:
connection_string: file:roomserver.db
max_open_conns: 10
@@ -311,8 +304,8 @@ room_server:
# Configuration for the Sync API.
sync_api:
internal_api:
- listen: http://localhost:7773
- connect: http://localhost:7773
+ listen: http://localhost:7773 # Only used in polylith deployments
+ connect: http://localhost:7773 # Only used in polylith deployments
external_api:
listen: http://[::]:8073
database:
@@ -336,8 +329,8 @@ user_api:
# This value can be low if performing tests or on embedded Dendrite instances (e.g WASM builds)
# bcrypt_cost: 10
internal_api:
- listen: http://localhost:7781
- connect: http://localhost:7781
+ listen: http://localhost:7781 # Only used in polylith deployments
+ connect: http://localhost:7781 # Only used in polylith deployments
account_database:
connection_string: file:userapi_accounts.db
max_open_conns: 10