From af7ae048f8868a58dc1b82a17ca701f28624b065 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 3 Nov 2014 15:06:40 +0000
Subject: Add option to not bind to HTTPS port. This is useful if running
 behind an ssl load balancer

---
 demo/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'demo')

diff --git a/demo/start.sh b/demo/start.sh
index fc6cd6303f..0530f0a26e 100755
--- a/demo/start.sh
+++ b/demo/start.sh
@@ -32,7 +32,7 @@ for port in 8080 8081 8082; do
         -D --pid-file "$DIR/$port.pid" \
         --manhole $((port + 1000)) \
         --tls-dh-params-path "demo/demo.tls.dh" \
-		$PARAMS
+		$PARAMS $SYNAPSE_PARAMS
 
     python -m synapse.app.homeserver \
         --config-path "demo/etc/$port.config" \
-- 
cgit 1.5.1


From dca3ba2f77a3530d78a951556ea8c6cfdc0463df Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Tue, 4 Nov 2014 16:19:03 +0000
Subject: Determine webclient path by the python module it is contained in

---
 demo/start.sh             | 2 +-
 synapse/app/homeserver.py | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'demo')

diff --git a/demo/start.sh b/demo/start.sh
index fc6cd6303f..8b0cc84fe6 100755
--- a/demo/start.sh
+++ b/demo/start.sh
@@ -41,6 +41,6 @@ for port in 8080 8081 8082; do
 done
 
 echo "Starting webclient on port 8000..."
-python "demo/webserver.py" -p 8000 -P "$DIR/webserver.pid" "webclient"
+python "demo/webserver.py" -p 8000 -P "$DIR/webserver.pid" "syweb/webclient"
 
 cd "$CWD"
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 6394bc27d1..b3dae5da64 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -42,6 +42,7 @@ import os
 import re
 import sys
 import sqlite3
+import syweb
 
 logger = logging.getLogger(__name__)
 
@@ -58,7 +59,9 @@ class SynapseHomeServer(HomeServer):
         return JsonResource()
 
     def build_resource_for_web_client(self):
-        return File("webclient")  # TODO configurable?
+        syweb_path = os.path.dirname(syweb.__file__)
+        webclient_path = os.path.join(syweb_path, "webclient")
+        return File(webclient_path)  # TODO configurable?
 
     def build_resource_for_content_repo(self):
         return ContentRepoResource(
-- 
cgit 1.5.1


From ff23e5ba3764506c99d9c1c640e202fe262b65ce Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Wed, 19 Nov 2014 16:45:25 +0000
Subject: remove demo webserver since synapse serves up the webclient itself

---
 demo/start.sh | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'demo')

diff --git a/demo/start.sh b/demo/start.sh
index 886d21cfa8..ce3e292486 100755
--- a/demo/start.sh
+++ b/demo/start.sh
@@ -40,7 +40,4 @@ for port in 8080 8081 8082; do
 
 done
 
-echo "Starting webclient on port 8000..."
-python "demo/webserver.py" -p 8000 -P "$DIR/webserver.pid" "syweb/webclient"
-
 cd "$CWD"
-- 
cgit 1.5.1