summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-25 12:01:23 +0100
committerErik Johnston <erik@matrix.org>2015-08-25 12:01:23 +0100
commit86cef6a91b330d99b86cf2eacf75a446ce2e2955 (patch)
tree7a71e2e8a17dd9e5f61b40fe6b9baac5f89cb9cf /synapse/app/homeserver.py
parentBump version and changelog (diff)
downloadsynapse-86cef6a91b330d99b86cf2eacf75a446ce2e2955.tar.xz
Allow specifying a directory to host a web client from
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index f04493f92a..2c59457cda 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -97,9 +97,11 @@ class SynapseHomeServer(HomeServer):
         return JsonResource(self)
 
     def build_resource_for_web_client(self):
-        import syweb
-        syweb_path = os.path.dirname(syweb.__file__)
-        webclient_path = os.path.join(syweb_path, "webclient")
+        webclient_path = self.get_config().web_client_location
+        if not webclient_path:
+            import syweb
+            syweb_path = os.path.dirname(syweb.__file__)
+            webclient_path = os.path.join(syweb_path, "webclient")
         # GZip is disabled here due to
         # https://twistedmatrix.com/trac/ticket/7678
         # (It can stay enabled for the API resources: they call