Skip to content
Snippets Groups Projects
Unverified Commit 9890f234 authored by Andrew Morgan's avatar Andrew Morgan Committed by GitHub
Browse files

Suppress the trusted key server warning for matrix.org in the demo scripts (#15527)

parent a7b3e9ce
No related branches found
No related tags found
No related merge requests found
Don't use a trusted key server when running the demo scripts.
\ No newline at end of file
...@@ -46,7 +46,7 @@ for port in 8080 8081 8082; do ...@@ -46,7 +46,7 @@ for port in 8080 8081 8082; do
echo '' echo ''
# Warning, this heredoc depends on the interaction of tabs and spaces. # Warning, this heredoc depends on the interaction of tabs and spaces.
# Please don't accidentaly bork me with your fancy settings. # Please don't accidentally bork me with your fancy settings.
listeners=$(cat <<-PORTLISTENERS listeners=$(cat <<-PORTLISTENERS
# Configure server to listen on both $https_port and $port # Configure server to listen on both $https_port and $port
# This overides some of the default settings above # This overides some of the default settings above
...@@ -80,12 +80,8 @@ for port in 8080 8081 8082; do ...@@ -80,12 +80,8 @@ for port in 8080 8081 8082; do
echo "tls_certificate_path: \"$DIR/$port/localhost:$port.tls.crt\"" echo "tls_certificate_path: \"$DIR/$port/localhost:$port.tls.crt\""
echo "tls_private_key_path: \"$DIR/$port/localhost:$port.tls.key\"" echo "tls_private_key_path: \"$DIR/$port/localhost:$port.tls.key\""
# Ignore keys from the trusted keys server # Request keys directly from servers contacted over federation
echo '# Ignore keys from the trusted keys server' echo 'trusted_key_servers: []'
echo 'trusted_key_servers:'
echo ' - server_name: "matrix.org"'
echo ' accept_keys_insecurely: true'
echo ''
# Allow the servers to communicate over localhost. # Allow the servers to communicate over localhost.
allow_list=$(cat <<-ALLOW_LIST allow_list=$(cat <<-ALLOW_LIST
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment