From dca3ba2f77a3530d78a951556ea8c6cfdc0463df Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Tue, 4 Nov 2014 16:19:03 +0000 Subject: [PATCH] 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(-) diff --git a/demo/start.sh b/demo/start.sh index fc6cd6303..8b0cc84fe 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 6394bc27d..b3dae5da6 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(