diff options
| author | Jorik Schellekens <joriksch@gmail.com> | 2019-07-22 11:31:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-22 11:31:05 +0100 |
| commit | f337d2f0f089e5b53e13c85fef0b89e93defa5e5 (patch) | |
| tree | 7cc8f739f9ba823b6dc300422f6ee07343b06f0e | |
| parent | Merge branch 'release-v1.2.0' into develop (diff) | |
| download | synapse-f337d2f0f089e5b53e13c85fef0b89e93defa5e5.tar.xz | |
Demo uses deprecated cli option (#5725)
* Remove deprecated 'verbose' cli arg * Create 5725.bugfix
| -rw-r--r-- | changelog.d/5725.bugfix | 1 | ||||
| -rwxr-xr-x | demo/start.sh | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/changelog.d/5725.bugfix b/changelog.d/5725.bugfix new file mode 100644 index 0000000000..73ef419727 --- /dev/null +++ b/changelog.d/5725.bugfix @@ -0,0 +1 @@ +start.sh no longer uses deprecated cli option. diff --git a/demo/start.sh b/demo/start.sh index 1c4f12d0bb..eccaa2abeb 100755 --- a/demo/start.sh +++ b/demo/start.sh @@ -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 @@ -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'] @@ -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 @@ -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 |