summary refs log tree commit diff
path: root/demo/start.sh
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-01 19:57:28 +0100
committerErik Johnston <erik@matrix.org>2014-09-01 19:57:28 +0100
commitf452899fe2a1bcf3f9d3313eeb108660b5cbf677 (patch)
treeedae89fefddc1f820f5bcae8409a85c36f1b2a0e /demo/start.sh
parentFix the tests to include new db calls (diff)
parentMerge branch 'server2server_tls' into develop (diff)
downloadsynapse-f452899fe2a1bcf3f9d3313eeb108660b5cbf677.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
Diffstat (limited to 'demo/start.sh')
-rwxr-xr-xdemo/start.sh14
1 files changed, 12 insertions, 2 deletions
diff --git a/demo/start.sh b/demo/start.sh
index 1e591aabb8..56a1344344 100755
--- a/demo/start.sh
+++ b/demo/start.sh
@@ -6,17 +6,27 @@ CWD=$(pwd)
 
 cd "$DIR/.."
 
+mkdir -p demo/etc
+
 for port in 8080 8081 8082; do
     echo "Starting server on port $port... "
 
     python -m synapse.app.homeserver \
+        --generate-config \
+        --config-path "demo/etc/$port.config" \
+        -H "localhost:$port" \
         -p "$port" \
         -H "localhost:$port" \
         -f "$DIR/$port.log" \
         -d "$DIR/$port.db" \
-        -vv \
         -D --pid-file "$DIR/$port.pid" \
-        --manhole $((port + 1000))
+        --manhole $((port + 1000)) \
+        --tls-dh-params-path "demo/demo.tls.dh"
+
+    python -m synapse.app.homeserver \
+        --config-path "demo/etc/$port.config" \
+        -vv \
+
 done
 
 echo "Starting webclient on port 8000..."