mirrors: Move into download section

[ipfire.org.git] / src / web / __init__.py

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 651d4de7f984408f61feafba7e0570b469f2378e..32bade619944e1dd37b1dc6e04c8dbae42443b3c 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -22,7 +22,6 @@ from . import download
 from . import fireinfo
 from . import iuse
 from . import location
-from . import mirrors
 from . import nopaste
 from . import people
 from . import ui_modules
@@ -133,6 +132,8 @@ class Application(tornado.web.Application):
                        # Download sites
                        (r"/downloads", tornado.web.RedirectHandler, { "url" : "/download" }),
                        (r"/download", download.IndexHandler),
+                       (r"/download/mirrors", download.MirrorsHandler),
+                       (r"/download/mirrors/([0-9a-z\-\.]+)", download.MirrorHandler),
                        (r"/download/thank-you", download.ThankYouHandler),
                        (r"/download/([0-9a-z\-\.]+)", download.ReleaseHandler),
 
@@ -180,9 +181,9 @@ class Application(tornado.web.Application):
                ])
 
                # mirrors.ipfire.org
-               self.add_handlers(r"^mirrors\.ipfire\.rocks", [
-                       (r"/", mirrors.IndexHandler),
-                       (r"/mirrors/(.*)", mirrors.MirrorHandler),
+               self.add_handlers(r"^mirrors\.ipfire\.org", [
+                       (r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/download/mirrors" }),
+                       (r"/mirrors/(.*)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/download/mirrors/{0}" }),
                ])
 
                # planet.ipfire.org