X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Frouting.py;h=adbe62537313b8ff2aa06a4807ad4c71f9766374;hb=00eda826cb3cb694c4e9f11e799ec5e4e57323ff;hp=ae56f8cb54a69083636f01183136c19821014326;hpb=12a100e4d8bdda7bd2353403a7e08e3a94669498;p=mediagoblin.git

diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py
index ae56f8cb..adbe6253 100644
--- a/mediagoblin/routing.py
+++ b/mediagoblin/routing.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -21,6 +21,9 @@ from mediagoblin.submit.routing import submit_routes
 from mediagoblin.user_pages.routing import user_routes
 from mediagoblin.edit.routing import edit_routes
 from mediagoblin.listings.routing import tag_routes
+from mediagoblin.webfinger.routing import webfinger_well_known_routes, \
+    webfinger_routes
+from mediagoblin.admin.routing import admin_routes
 
 
 def get_mapper():
@@ -36,5 +39,8 @@ def get_mapper():
     mapping.extend(user_routes, '/u')
     mapping.extend(edit_routes, '/edit')
     mapping.extend(tag_routes, '/tag')
+    mapping.extend(webfinger_well_known_routes, '/.well-known')
+    mapping.extend(webfinger_routes, '/api/webfinger')
+    mapping.extend(admin_routes, '/a')
 
     return mapping