Add torrent and magnet links for all downloads.

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

diff --git a/www/webapp/__init__.py b/www/webapp/__init__.py
index a8656d0ffc1e70f2ded9ba267f517b2179269ace..e23b68fcb1d9e8e18621f5a3189bac4b456bbb2e 100644 (file)
--- a/www/webapp/__init__.py
+++ b/www/webapp/__init__.py
@@ -89,7 +89,7 @@ class Application(tornado.web.Application):
                ])
 
                # downloads.ipfire.org
-               self.add_handlers(r"downloads\.ipfire\.org", [
+               self.add_handlers(r"downloads?\.ipfire\.org", [
                        (r"/", DownloadsIndexHandler),
                        (r"/latest", DownloadsLatestHandler),
                        (r"/release/([0-9]+)", DownloadsReleaseHandler),
@@ -102,9 +102,6 @@ class Application(tornado.web.Application):
                        (r"/(iso|torrent)/(.*)", DownloadCompatHandler),
                        (r"/(.*)", DownloadFileHandler),
                ])
-               self.add_handlers(r"download\.ipfire\.org", [
-                       (r".*", tornado.web.RedirectHandler, { "url" : "http://downloads.ipfire.org" })
-               ])
 
                # mirrors.ipfire.org
                self.add_handlers(r"mirrors\.ipfire\.org", [
@@ -152,8 +149,25 @@ class Application(tornado.web.Application):
                        (r"/a.*", TrackerAnnounceHandler),
                        (r"/scrape", TrackerScrapeHandler),
                        (r"/torrent/([0-9a-f]+)", TrackerDetailHandler),
+                       (r"/([0-9a-f]{40})", TrackerDetailHandler),
+                       (r"/([0-9a-f]{40})/download", TrackerDownloadHandler),
                ] + static_handlers)
 
+               # boot.ipfire.org
+               BOOT_STATIC_PATH = os.path.join(self.settings["static_path"], "netboot")
+               self.add_handlers(r"boot\.ipfire\.org", [
+                       (r"/", tornado.web.RedirectHandler, { "url" : "http://www.ipfire.org/download" }),
+
+                       # Configurations
+                       (r"/menu.gpxe", MenuGPXEHandler),
+                       (r"/menu.cfg", MenuCfgHandler),
+                       (r"/config/([0-9]+)/boot.gpxe", BootGPXEHandler),
+
+                       # Static files
+                       (r"/(boot.png|custom.gpxe|premenu.cfg|vesamenu.c32|menu.c32)",
+                               tornado.web.StaticFileHandler, { "path" : BOOT_STATIC_PATH }),
+               ])
+
                # nopaste.ipfire.org
                self.add_handlers(r"nopaste\.ipfire\.org", [
                        (r"/", NopasteIndexHandler),