OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix Shellcheck SC2129: Consider using {..} >> file 

Consider using { cmd1; cmd2; } >> file instead of individual redirects.

https://github.com/koalaman/shellcheck/wiki/SC2129

Signed-off-by: Dan Callahan <danc@element.io>
pull/11166/head
Dan Callahan 2021-10-22 23:00:04 +01:00
parent 13f084eb58
commit b5e910521b
No known key found for this signature in database
GPG Key ID: 5FAD56482D9EB851
1 changed files with 62 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
demo/start.sh
View File

@ -29,14 +29,17 @@ for port in 8080 8081 8082; do
--report-stats no
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"
# 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"
echo "public_baseurl: http://localhost:$port/" >> "$DIR/etc/$port.config"
# Regenerate configuration
{
printf '\n\n# Customisation made by demo/start.sh\n'
echo "public_baseurl: http://localhost:$port/"
echo 'enable_registration: true'
echo 'enable_registration: true' >> "$DIR/etc/$port.config"
# Warning, this heredoc depends on the interaction of tabs and spaces. Please don't
# accidentaly bork me with your fancy settings.
# Warning, this heredoc depends on the interaction of tabs and spaces.
# Please don't accidentaly 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
@ -57,26 +60,24 @@ for port in 8080 8081 8082; do
compress: false
PORTLISTENERS
)
echo "${listeners}" >> "$DIR/etc/$port.config"
echo "${listeners}"
# Disable tls for the servers
printf '\n\n# Disable tls on the servers.' >> "$DIR/etc/$port.config"
echo '# DO NOT USE IN PRODUCTION' >> "$DIR/etc/$port.config"
echo 'use_insecure_ssl_client_just_for_testing_do_not_use: true' >> "$DIR/etc/$port.config"
echo 'federation_verify_certificates: false' >> "$DIR/etc/$port.config"
printf '\n\n# Disable tls on the servers.'
echo '# DO NOT USE IN PRODUCTION'
echo 'use_insecure_ssl_client_just_for_testing_do_not_use: true'
echo 'federation_verify_certificates: false'
# Set tls paths
echo "tls_certificate_path: \"$DIR/etc/localhost:$https_port.tls.crt\"" >> "$DIR/etc/$port.config"
echo "tls_private_key_path: \"$DIR/etc/localhost:$https_port.tls.key\"" >> "$DIR/etc/$port.config"
# 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"
echo "tls_certificate_path: \"$DIR/etc/localhost:$https_port.tls.crt\""
echo "tls_private_key_path: \"$DIR/etc/localhost:$https_port.tls.key\""
# 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"
echo ' - server_name: "matrix.org"' >> "$DIR/etc/$port.config"
echo ' accept_keys_insecurely: true' >> "$DIR/etc/$port.config"
echo '# Ignore keys from the trusted keys server'
echo 'trusted_key_servers:'
echo ' - server_name: "matrix.org"'
echo ' accept_keys_insecurely: true'
# Reduce the blacklist
blacklist=$(cat <<-BLACK
@ -91,7 +92,9 @@ for port in 8080 8081 8082; do
- 'fc00::/7'
BLACK
)
echo "${blacklist}" >> "$DIR/etc/$port.config"
echo "${blacklist}"
} >> "$DIR/etc/$port.config"
fi
# Check script parameters