summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-11-04 16:19:03 +0000
committerMark Haines <mark.haines@matrix.org>2014-11-04 16:19:16 +0000
commitdca3ba2f77a3530d78a951556ea8c6cfdc0463df (patch)
treebeff76611772245df38bf128fd88042934ed654e /synapse
parentUpdate .gitignore to ignore config.js files in syweb/webclient. (diff)
downloadsynapse-dca3ba2f77a3530d78a951556ea8c6cfdc0463df.tar.xz
Determine webclient path by the python module it is contained in
Diffstat (limited to 'synapse')
-rwxr-xr-xsynapse/app/homeserver.py5
1 files changed, 4 insertions, 1 deletions
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(