Merge branch 'planet' into next

[ipfire.org.git] / www / webapp / __init__.py

diff --git a/www/webapp/__init__.py b/www/webapp/__init__.py
index 496b13ca35f1caf864fb30f32f0de27c49909a74..200c097474d35c5a348e9043245733de71968716 100644 (file)
--- a/www/webapp/__init__.py
+++ b/www/webapp/__init__.py
@@ -62,7 +62,6 @@ class Application(tornado.web.Application):
                        (r"/[A-Za-z]{2}/index", IndexHandler),
                        (r"/[A-Za-z]{2}/news", NewsHandler),
                        (r"/[A-Za-z]{2}/builds", BuildHandler),
-                       (r"/[A-Za-z]{2}/translations?", TranslationHandler),
                        # Download sites
                        (r"/[A-Za-z]{2}/downloads?", DownloadHandler),
                        (r"/[A-Za-z]{2}/downloads?/all", DownloadAllHandler),
@@ -72,8 +71,6 @@ class Application(tornado.web.Application):
                        # RSS feed
                        (r"/([A-Za-z]{2})/news.rss", RSSHandler),
                        (r"/data/feeds/main-([A-Za-z]{2}).rss", RSSHandler),
-                       # API
-                       (r"/api/cluster_info", ApiClusterInfoHandler),
                        # Always the last rule
                        (r"/[A-Za-z]{2}/(.*)", StaticHandler),
                ] + static_handlers)
@@ -114,6 +111,8 @@ class Application(tornado.web.Application):
                        (r"/", MainHandler),
                        (r"/[A-Za-z]{2}/?", MainHandler),
                        (r"/[A-Za-z]{2}/index", DownloadTorrentHandler),
+                       (r"/a.*", TrackerAnnounceHandler),
+                       (r"/scrape", TrackerScrapeHandler),
                ] + static_handlers)
 
                # admin.ipfire.org