From c8d0f97e10184a3f94eb0fff3f1da6b65e2efb52 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 3 May 2023 12:19:25 +0100 Subject: [PATCH] Request keys directly from federated servers instead There's no reason to set a trusted key server in a private federation demo setup --- demo/start.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/demo/start.sh b/demo/start.sh index bcb0bdecbdfd..06ec6f985f35 100755 --- a/demo/start.sh +++ b/demo/start.sh @@ -80,15 +80,8 @@ for port in 8080 8081 8082; do echo "tls_certificate_path: \"$DIR/$port/localhost:$port.tls.crt\"" echo "tls_private_key_path: \"$DIR/$port/localhost:$port.tls.key\"" - # Ignore keys from the trusted keys server - echo '# Ignore keys from the trusted keys server.' - echo '# Specifically, we do this by omitting the "verify_keys" option' - echo '# and enabling "accept_keys_insecurely"' - echo 'trusted_key_servers:' - echo ' - server_name: "matrix.org"' - echo ' accept_keys_insecurely: true' - echo 'suppress_key_server_warning: true' - echo '' + # Request keys directly from servers contacted over federation + echo 'trusted_key_servers: []' # Allow the servers to communicate over localhost. allow_list=$(cat <<-ALLOW_LIST