summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-02-23 15:35:09 +0000
committerKegan Dougal <kegan@matrix.org>2015-02-23 15:35:09 +0000
commit0696dfd94b5d32679009368508d26ae1a6630994 (patch)
treeb51868af754c23165730550b7e1af22e4b1064c3 /synapse/app
parentAdd RegisterFallbackResource to /_matrix/static/client/register (diff)
downloadsynapse-0696dfd94b5d32679009368508d26ae1a6630994.tar.xz
Actually treat this as static content, not random Resources.
Diffstat (limited to 'synapse/app')
-rwxr-xr-xsynapse/app/homeserver.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 137293bd69..688bf8d967 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -36,7 +36,8 @@ from synapse.http.server_key_resource import LocalKey
 from synapse.http.matrixfederationclient import MatrixFederationHttpClient
 from synapse.api.urls import (
     CLIENT_PREFIX, FEDERATION_PREFIX, WEB_CLIENT_PREFIX, CONTENT_REPO_PREFIX,
-    SERVER_KEY_PREFIX, MEDIA_PREFIX, CLIENT_V2_ALPHA_PREFIX, APP_SERVICE_PREFIX
+    SERVER_KEY_PREFIX, MEDIA_PREFIX, CLIENT_V2_ALPHA_PREFIX, APP_SERVICE_PREFIX,
+    STATIC_PREFIX
 )
 from synapse.config.homeserver import HomeServerConfig
 from synapse.crypto import context_factory
@@ -81,6 +82,9 @@ class SynapseHomeServer(HomeServer):
         webclient_path = os.path.join(syweb_path, "webclient")
         return File(webclient_path)  # TODO configurable?
 
+    def build_resource_for_static_content(self):
+        return File("static")
+
     def build_resource_for_content_repo(self):
         return ContentRepoResource(
             self, self.upload_dir, self.auth, self.content_addr
@@ -124,8 +128,8 @@ class SynapseHomeServer(HomeServer):
             (SERVER_KEY_PREFIX, self.get_resource_for_server_key()),
             (MEDIA_PREFIX, self.get_resource_for_media_repository()),
             (APP_SERVICE_PREFIX, self.get_resource_for_app_services()),
+            (STATIC_PREFIX, self.get_resource_for_static_content())
         ]
-        desired_tree += self.get_resource_for_client().get_extra_resources(self)
 
         if web_client:
             logger.info("Adding the web client.")