Kill MultiRemoteStaticDirect... nobody was really using it anyway

[mediagoblin.git] / mediagoblin / routing.py

diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py
index 125f727072c56e49e634bbdc90228e60c0c63723..adbe62537313b8ff2aa06a4807ad4c71f9766374 100644 (file)
--- a/mediagoblin/routing.py
+++ b/mediagoblin/routing.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# 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,7 +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.confirm.routing import confirm_routes
+from mediagoblin.webfinger.routing import webfinger_well_known_routes, \
+    webfinger_routes
+from mediagoblin.admin.routing import admin_routes
 
 
 def get_mapper():
@@ -37,6 +39,8 @@ def get_mapper():
     mapping.extend(user_routes, '/u')
     mapping.extend(edit_routes, '/edit')
     mapping.extend(tag_routes, '/tag')
-    mapping.extend(confirm_routes, '/confirm')
+    mapping.extend(webfinger_well_known_routes, '/.well-known')
+    mapping.extend(webfinger_routes, '/api/webfinger')
+    mapping.extend(admin_routes, '/a')
 
     return mapping