summary refs log tree commit diff
path: root/demo/start.sh
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-09-01 19:56:22 +0100
committerMark Haines <mark.haines@matrix.org>2014-09-01 19:56:22 +0100
commitff79437d9bceef3e6c824906a7588f3658e80e13 (patch)
tree5b3fea43683e68d8e7ea246e97b9958f4a41913e /demo/start.sh
parentFollow API renaming. state -> presence. mtime_ago -> last_active_ago (diff)
parentFix SSL for federation http client (diff)
downloadsynapse-ff79437d9bceef3e6c824906a7588f3658e80e13.tar.xz
Merge branch 'server2server_tls' into develop
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..."