web: Rename boot module

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 83d55e0f5061111e14dff25028f9181a9bc090dd..28b7beac2d2876c10ee3d25c8b030fef356eef73 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,9 +77,9 @@ web_PYTHON = \
        src/web/auth.py \
        src/web/base.py \
        src/web/blog.py \
+       src/web/boot.py \
        src/web/download.py \
        src/web/handlers.py \
-       src/web/handlers_boot.py \
        src/web/handlers_fireinfo.py \
        src/web/handlers_iuse.py \
        src/web/handlers_mirrors.py \

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 63c059cc08a478a0f75dd1bcb096ff401265b631..72d72ba7bf44c38c75eaaed505b5bb4eb1a1f6e8 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -15,6 +15,7 @@ from .handlers import *
 
 from . import auth
 from . import blog
+from . import boot
 from . import download
 from . import location
 from . import newsletter
@@ -222,12 +223,12 @@ class Application(tornado.web.Application):
                # boot.ipfire.org
                BOOT_STATIC_PATH = os.path.join(self.settings["static_path"], "netboot")
                self.add_handlers(r"boot(\.dev)?\.ipfire\.org", [
-                       (r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/download" }),
+                       (r"/", tornado.web.RedirectHandler, { "url" : "https://wiki.ipfire.org/installation/pxe" }),
 
                        # Configurations
-                       (r"/premenu.cfg", PremenuCfgHandler),
-                       (r"/menu.gpxe", MenuGPXEHandler),
-                       (r"/menu.cfg", MenuCfgHandler),
+                       (r"/premenu.cfg", boot.PremenuCfgHandler),
+                       (r"/menu.gpxe", boot.MenuGPXEHandler),
+                       (r"/menu.cfg", boot.MenuCfgHandler),
 
                        # Static files
                        (r"/(boot\.png|pxelinux\.0|menu\.c32|vesamenu\.c32)",

diff --git a/src/web/handlers_boot.py b/src/web/boot.py
similarity index 100%
rename from src/web/handlers_boot.py
rename to src/web/boot.py

diff --git a/src/web/handlers.py b/src/web/handlers.py
index 47758256a3c30ef3039e6f4f31a5613d43d71044..33d63ca75faf3888e84f693e654aaa331599e007 100644 (file)
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -6,7 +6,6 @@ import tornado.web
 
 from . import base
 
-from .handlers_boot import *
 from .handlers_fireinfo import *
 from .handlers_iuse import *
 from .handlers_mirrors import *