location: Create a page that explains how to report problems

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

diff --git a/src/web/__init__.py b/src/web/__init__.py
index de561c7ad72d7dace94985ae41f8ec2ae361011d..dfc72eaa1212e30f246913f2dc7d6bc99ebb17d1 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -176,7 +176,7 @@ class Application(tornado.web.Application):
                        (r"/donate/check-vat-number", donate.CheckVATNumberHandler),
 
                        # Fireinfo
-                       (r"/fireinfo", fireinfo.IndexHandler),
+                       (r"/fireinfo/?", fireinfo.IndexHandler),
                        (r"/fireinfo/admin", fireinfo.AdminIndexHandler),
                        (r"/fireinfo/vendors", fireinfo.VendorsHandler),
                        (r"/fireinfo/vendors/(pci|usb)/([0-9a-f]{4})", fireinfo.VendorHandler),
@@ -185,8 +185,6 @@ class Application(tornado.web.Application):
                        (r"/fireinfo/profile/([a-z0-9]{40})", fireinfo.ProfileHandler),
                        (r"/fireinfo/processors", fireinfo.ProcessorsHandler),
                        (r"/fireinfo/releases", fireinfo.ReleasesHandler),
-                       (r"/fireinfo/send/([a-z0-9]+)", fireinfo.ProfileSendHandler),
-                       (r"/fireinfo/static/(.*)", tornado.web.StaticFileHandler, { "path" : self.settings.get("static_path") }),
 
                        # Lists
                        (r"/lists", lists.IndexHandler),
@@ -196,10 +194,15 @@ class Application(tornado.web.Application):
                        (r"/password\-reset/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.PasswordResetHandler),
                        (r"/.well-known/change-password", auth.WellKnownChangePasswordHandler),
 
-                       # Projects
-                       (r"/location/?", location.IndexHandler),
-                       (r"/location/download", StaticHandler, { "template" : "location/download.html" }),
-                       (r"/location/how\-to\-use", StaticHandler, { "template" : "location/how-to-use.html" }),
+                       # Location
+                       (r"/location/?", StaticHandler, { "template" : "location/index.html" }),
+                       (r"/location/download", tornado.web.RedirectHandler, { "url" : "/location/install" }),
+                       (r"/location/how\-to\-use", StaticHandler, { "template" : "location/how-to-use/index.html" }),
+                       (r"/location/how\-to\-use/cli", StaticHandler, { "template" : "location/how-to-use/cli.html" }),
+                       (r"/location/how\-to\-use/dns", StaticHandler, { "template" : "location/how-to-use/dns.html" }),
+                       (r"/location/how\-to\-use/python", StaticHandler, { "template" : "location/how-to-use/python.html" }),
+                       (r"/location/install", StaticHandler, { "template" : "location/install.html" }),
+                       (r"/location/report\-a\-problem", StaticHandler, { "template" : "location/report-a-problem.html" }),
                        (r"/location/lookup/(.+)", location.LookupHandler),
 
                        # Single-Sign-On for Discourse
@@ -244,6 +247,7 @@ class Application(tornado.web.Application):
                        (r"/imprint", tornado.web.RedirectHandler, { "url" : "/legal" }),
                        (r"/news.rss", tornado.web.RedirectHandler, { "url" : "/blog/feed.xml" }),
                        (r"/news/(.*)", tornado.web.RedirectHandler, { "url" : "/blog/{0}" }),
+                       (r"/projects(/.*)", tornado.web.RedirectHandler, { "url" : "{0}" }),
                        (r"/support", tornado.web.RedirectHandler, { "url" : "/help"}),
                        (r"/(de|en)/(.*)", tornado.web.RedirectHandler, { "url" : "/{0}"}),
 
@@ -290,34 +294,14 @@ class Application(tornado.web.Application):
                        (r"/news.rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }),
                ])
 
-               # fireinfo.ipfire.org - LEGACY REDIRECTION
+               # fireinfo.ipfire.org
                self.add_handlers(r"fireinfo\.([a-z]+\.dev\.)?ipfire\.org", [
-                       (r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/fireinfo/" }),
+                       # Handle profiles
+                       (r"/send/([a-z0-9]+)", fireinfo.ProfileSendHandler),
 
-                       # Admin
-                       (r"/admin", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/fireinfo/admin" }),
-
-                       # Vendors
-                       (r"/vendors", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/fireinfo/vendors" }),
-                       (r"/vendors/(pci|usb)/([0-9a-f]{4})", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/fireinfo/vendors/(pci|usb)/([0-9a-f]{4})" }),
-
-                       # Driver
-                       (r"/drivers/(.*)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/fireinfo/drivers/(.*)" }),
-
-                       # Show profiles
-                       (r"/profile/random", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/fireinfo/profile/random" }),
-                       (r"/profile/([a-z0-9]{40})", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/fireinfo/profile/([a-z0-9]{40})" }),
-
-                       # Stats
-                       (r"/processors", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/fireinfo/processors" }),
-                       (r"/releases", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/fireinfo/releases" }),
-
-                       # Send profiles
-                       (r"/send/([a-z0-9]+)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/fireinfo/send/([a-z0-9]+)" }),
-
-                       # Serve any static files
-                       (r"/static/(.*)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/fireinfo/static/(.*)" }),
-               ] + authentication_handlers)
+                       # Redirect anything else
+                       (r"(.*)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/fireinfo{0}" }),
+               ])
 
                # i-use.ipfire.org
                self.add_handlers(r"i-use\.([a-z]+\.dev\.)?ipfire\.org", [
@@ -355,7 +339,7 @@ class Application(tornado.web.Application):
 
                # location.ipfire.org
                self.add_handlers(r"location\.([a-z]+\.dev\.)?ipfire\.org", [
-                       (r"(.*)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/projects/location{0}" }),
+                       (r"(.*)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/location{0}" }),
                ])
 
                # geoip.ipfire.org