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

Demo uses deprecated cli option #5725

Merged
merged 2 commits into from
Jul 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5725.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
start.sh no longer uses deprecated cli option.
7 changes: 3 additions & 4 deletions demo/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ for port in 8080 8081 8082; do

if ! grep -F "Customisation made by demo/start.sh" -q $DIR/etc/$port.config; then
printf '\n\n# Customisation made by demo/start.sh\n' >> $DIR/etc/$port.config

echo 'enable_registration: true' >> $DIR/etc/$port.config

# Warning, this heredoc depends on the interaction of tabs and spaces. Please don't
Expand All @@ -43,7 +43,7 @@ for port in 8080 8081 8082; do
tls: true
resources:
- names: [client, federation]

- port: $port
tls: false
bind_addresses: ['::1', '127.0.0.1']
Expand All @@ -68,7 +68,7 @@ for port in 8080 8081 8082; do

# Generate tls keys
openssl req -x509 -newkey rsa:4096 -keyout $DIR/etc/localhost\:$https_port.tls.key -out $DIR/etc/localhost\:$https_port.tls.crt -days 365 -nodes -subj "/O=matrix"

# Ignore keys from the trusted keys server
echo '# Ignore keys from the trusted keys server' >> $DIR/etc/$port.config
echo 'trusted_key_servers:' >> $DIR/etc/$port.config
Expand Down Expand Up @@ -120,7 +120,6 @@ for port in 8080 8081 8082; do
python3 -m synapse.app.homeserver \
--config-path "$DIR/etc/$port.config" \
-D \
-vv \

popd
done
Expand Down