summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-14 10:05:06 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-14 10:05:06 +0100
commit29aa13f0d4424729813bea99b84d34a3b3d4e68c (patch)
treeb3affb6c40d3501bd0c4a432a351b7f88e5051dc /synapse/app
parentStart phasing out HttpServer: we should be using Resources instead. Added res... (diff)
downloadsynapse-29aa13f0d4424729813bea99b84d34a3b3d4e68c.tar.xz
Make federation use resource_for_federation as well.
Diffstat (limited to 'synapse/app')
-rw-r--r--synapse/app/homeserver.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 1acc87e99c..d9494cb054 100644
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -27,6 +27,7 @@ from twisted.web.server import Site
 from synapse.http.server import TwistedHttpServer, JsonResource
 from synapse.http.client import TwistedHttpClient
 from synapse.rest.base import CLIENT_PREFIX
+from synapse.federation.transport import PREFIX
 
 from daemonize import Daemonize
 
@@ -94,7 +95,8 @@ class SynapseHomeServer(HomeServer):
         """
         desired_tree = (  # list of tuples containing (path_str, Resource)
             ("/matrix/client", self.get_resource_for_web_client()),
-            (CLIENT_PREFIX, self.get_resource_for_client())
+            (CLIENT_PREFIX, self.get_resource_for_client()),
+            (PREFIX, self.get_resource_for_federation())
         )
 
         self.root_resource = Resource()