Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Operate
Environments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Matrix
Commits
9890f234
Unverified
Commit
9890f234
authored
1 year ago
by
Andrew Morgan
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Suppress the trusted key server warning for matrix.org in the demo scripts (#15527)
parent
a7b3e9ce
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changelog.d/15527.misc
+1
-0
1 addition, 0 deletions
changelog.d/15527.misc
demo/start.sh
+3
-7
3 additions, 7 deletions
demo/start.sh
with
4 additions
and
7 deletions
changelog.d/15527.misc
0 → 100644
+
1
−
0
View file @
9890f234
Don't use a trusted key server when running the demo scripts.
\ No newline at end of file
This diff is collapsed.
Click to expand it.
demo/start.sh
+
3
−
7
View file @
9890f234
...
@@ -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 accidental
l
y 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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment