projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kill MultiRemoteStaticDirect... nobody was really using it anyway
[mediagoblin.git]
/
mediagoblin
/
routing.py
diff --git
a/mediagoblin/routing.py
b/mediagoblin/routing.py
index b854c85a5d3dcdf40393c095922011a257902f4d..adbe62537313b8ff2aa06a4807ad4c71f9766374 100644
(file)
--- a/
mediagoblin/routing.py
+++ b/
mediagoblin/routing.py
@@
-1,5
+1,5
@@
# GNU MediaGoblin -- federated, autonomous media hosting
# 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
#
# 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
@@
-20,6
+20,11
@@
from mediagoblin.auth.routing import auth_routes
from mediagoblin.submit.routing import submit_routes
from mediagoblin.user_pages.routing import user_routes
from mediagoblin.edit.routing import edit_routes
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():
mapping = Mapper()
def get_mapper():
mapping = Mapper()
@@
-33,5
+38,9
@@
def get_mapper():
mapping.extend(submit_routes, '/submit')
mapping.extend(user_routes, '/u')
mapping.extend(edit_routes, '/edit')
mapping.extend(submit_routes, '/submit')
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
return mapping