Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 9890f23

Browse files
Suppress the trusted key server warning for matrix.org in the demo scripts (#15527)
1 parent a7b3e9c commit 9890f23

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

changelog.d/15527.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Don't use a trusted key server when running the demo scripts.

demo/start.sh

+3-7
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ for port in 8080 8081 8082; do
4646
echo ''
4747

4848
# Warning, this heredoc depends on the interaction of tabs and spaces.
49-
# Please don't accidentaly bork me with your fancy settings.
49+
# Please don't accidentally bork me with your fancy settings.
5050
listeners=$(cat <<-PORTLISTENERS
5151
# Configure server to listen on both $https_port and $port
5252
# This overides some of the default settings above
@@ -80,12 +80,8 @@ for port in 8080 8081 8082; do
8080
echo "tls_certificate_path: \"$DIR/$port/localhost:$port.tls.crt\""
8181
echo "tls_private_key_path: \"$DIR/$port/localhost:$port.tls.key\""
8282

83-
# Ignore keys from the trusted keys server
84-
echo '# Ignore keys from the trusted keys server'
85-
echo 'trusted_key_servers:'
86-
echo ' - server_name: "matrix.org"'
87-
echo ' accept_keys_insecurely: true'
88-
echo ''
83+
# Request keys directly from servers contacted over federation
84+
echo 'trusted_key_servers: []'
8985

9086
# Allow the servers to communicate over localhost.
9187
allow_list=$(cat <<-ALLOW_LIST

0 commit comments

Comments
 (0)