summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-14 11:52:56 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-14 11:52:56 +0100
commitc75add6ec87cb548b5cc74b7e6e0c56d78d5eae9 (patch)
treea3d49973303039996d9aaee7a05bad44df83a80c /synapse/app/homeserver.py
parentIf the web client is enabled, automatically redirect root '/' to the web clie... (diff)
downloadsynapse-c75add6ec87cb548b5cc74b7e6e0c56d78d5eae9.tar.xz
Added a urls module for keeping client and federation prefixes.
Diffstat (limited to '')
-rw-r--r--synapse/app/homeserver.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index e2489abc86..7c356e7855 100644
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -26,8 +26,7 @@ from twisted.web.static import File
 from twisted.web.server import Site
 from synapse.http.server import JsonResource, RootRedirect
 from synapse.http.client import TwistedHttpClient
-from synapse.rest.base import CLIENT_PREFIX
-from synapse.federation.transport import PREFIX
+from synapse.api.urls import CLIENT_PREFIX, FEDERATION_PREFIX
 
 from daemonize import Daemonize
 
@@ -101,7 +100,7 @@ class SynapseHomeServer(HomeServer):
         # [ ("/aaa/bbb/cc", Resource1), ("/aaa/dummy", Resource2) ]
         desired_tree = [
             (CLIENT_PREFIX, self.get_resource_for_client()),
-            (PREFIX, self.get_resource_for_federation())
+            (FEDERATION_PREFIX, self.get_resource_for_federation())
         ]
         if web_client:
             logger.info("Adding the web client.")