diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2023-05-03 13:07:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-03 12:07:49 +0000 |
| commit | 9890f23469092be88f5669e226e9f81d2d309cb2 (patch) | |
| tree | 4a5a2cb8fad570bf4c639a71b1c2d992587f29b2 | |
| parent | Set thread_id column to non-null for event_push_{actions,actions_staging,summ... (diff) | |
| download | synapse-9890f23469092be88f5669e226e9f81d2d309cb2.tar.xz | |
Suppress the trusted key server warning for matrix.org in the demo scripts (#15527)
| -rw-r--r-- | changelog.d/15527.misc | 1 | ||||
| -rwxr-xr-x | demo/start.sh | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/changelog.d/15527.misc b/changelog.d/15527.misc new file mode 100644 index 0000000000..752a32adeb --- /dev/null +++ b/changelog.d/15527.misc @@ -0,0 +1 @@ +Don't use a trusted key server when running the demo scripts. \ No newline at end of file diff --git a/demo/start.sh b/demo/start.sh index fdd75816fb..06ec6f985f 100755 --- a/demo/start.sh +++ b/demo/start.sh @@ -46,7 +46,7 @@ for port in 8080 8081 8082; do echo '' # 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 # Configure server to listen on both $https_port and $port # This overides some of the default settings above @@ -80,12 +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 'trusted_key_servers:' - echo ' - server_name: "matrix.org"' - echo ' accept_keys_insecurely: 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 |