summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-26 15:35:07 +0000
committerErik Johnston <erik@matrix.org>2015-10-26 15:37:44 +0000
commitfa1cf5ef34e684b58433119d78dc95923955ff4f (patch)
tree7dd381962c5af08819b07c3764c2d68e34385d1e /synapse/app
parentFix receipts for room initial sync (diff)
downloadsynapse-fa1cf5ef34e684b58433119d78dc95923955ff4f.tar.xz
Move static folder into synapse
This is because otherwise it won't get picked up by python packaging.

This also fixes the problem where the "static" folder was found if
synapse wasn't started from that directory.
Diffstat (limited to 'synapse/app')
-rwxr-xr-xsynapse/app/homeserver.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index cf2fa221dc..a77535a4ee 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -132,7 +132,9 @@ class SynapseHomeServer(HomeServer):
 
     def build_resource_for_static_content(self):
         # This is old and should go away: not going to bother adding gzip
-        return File("static")
+        return File(
+            os.path.join(os.path.dirname(synapse.__file__), "static")
+        )
 
     def build_resource_for_content_repo(self):
         return ContentRepoResource(