From 683a94926b00852d404bd3b483da2992ba2b332f Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Wed, 17 Nov 2021 12:32:34 +0000
Subject: [PATCH 1/2] Specify JetStream configuration items for NATS builds of
 Dendrite

---
 lib/SyTest/Homeserver/Dendrite.pm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/SyTest/Homeserver/Dendrite.pm b/lib/SyTest/Homeserver/Dendrite.pm
index 87ae8bfbf..e35640ad8 100644
--- a/lib/SyTest/Homeserver/Dendrite.pm
+++ b/lib/SyTest/Homeserver/Dendrite.pm
@@ -102,6 +102,11 @@ sub _get_config
          private_key => $self->{paths}{matrix_key},
          presence_enabled => $JSON::true,
 
+         jetstream => {
+             storage_path => $self->{hs_dir},
+             in_memory => $JSON::true,
+         },
+
          kafka => {
             use_naffka => $JSON::true,
             naffka_database => {

From 23c8cb2d6b9089a9532e2482c8e4b97405b39d59 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Mon, 22 Nov 2021 15:29:04 +0000
Subject: [PATCH 2/2] Update Dendrite config file for matrix-org/dendrite#2055

---
 lib/SyTest/Homeserver/Dendrite.pm | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/lib/SyTest/Homeserver/Dendrite.pm b/lib/SyTest/Homeserver/Dendrite.pm
index e35640ad8..3937a5658 100644
--- a/lib/SyTest/Homeserver/Dendrite.pm
+++ b/lib/SyTest/Homeserver/Dendrite.pm
@@ -167,16 +167,13 @@ sub _get_config
       },
 
       federation_api => {
-         federation_certificates => [$self->{paths}{tls_cert}],
-      },
-
-      federation_sender => {
          database => {
              connection_string => 
                 ( ! defined $ENV{'POSTGRES'} || $ENV{'POSTGRES'} == '0') ?
                 "file:$self->{hs_dir}/federation_sender.db" : $db_uri,
          },
          disable_tls_validation => $JSON::true,
+         federation_certificates => [$self->{paths}{tls_cert}],
       },
 
       key_server => {
@@ -213,14 +210,6 @@ sub _get_config
          },
       },
 
-      signing_key_server => {
-         database => {
-            connection_string => 
-               ( ! defined $ENV{'POSTGRES'} || $ENV{'POSTGRES'} == '0') ?
-               "file:$self->{hs_dir}/signingkeyserver.db" : $db_uri,
-         },
-      },
-
       sync_api => {
          database => {
             connection_string =>