lists: Implement some basic code to talk to Mailman

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

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 86aada8515dbde2523e131f389b579f233fbbb62..04e71e9f9c06720559fa47c567b68c37efa69d1c 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -22,6 +22,7 @@ from . import donate
 from . import downloads
 from . import fireinfo
 from . import iuse
+from . import lists
 from . import location
 from . import nopaste
 from . import ui_modules
@@ -97,6 +98,7 @@ class Application(tornado.web.Application):
 
                                # Misc
                                "ChristmasBanner"      : ui_modules.ChristmasBannerModule,
+                               "IPFireLogo"           : ui_modules.IPFireLogoModule,
                                "Markdown"             : ui_modules.MarkdownModule,
                                "Map"                  : ui_modules.MapModule,
                                "ProgressBar"          : ui_modules.ProgressBarModule,
@@ -135,6 +137,7 @@ class Application(tornado.web.Application):
                        (r"/blog/([0-9a-z\-\._]+)/delete", blog.DeleteHandler),
                        (r"/blog/([0-9a-z\-\._]+)/edit", blog.EditHandler),
                        (r"/blog/([0-9a-z\-\._]+)/publish", blog.PublishHandler),
+                       (r"/blog/([0-9a-z\-\._]+)/debug/email", blog.DebugEmailHandler),
 
                        # Docs
                        (r"/docs/recent\-changes", docs.RecentChangesHandler),
@@ -143,13 +146,13 @@ class Application(tornado.web.Application):
                        (r"/docs/watchlist", docs.WatchlistHandler),
                        (r"/docs/_restore", docs.RestoreHandler),
                        (r"/docs/_upload", docs.UploadHandler),
-                       (r"/docs/([A-Za-z0-9\-_\/]+)?/_edit", docs.EditHandler),
-                       (r"/docs/([A-Za-z0-9\-_\/]+)?/_render", docs.RenderHandler),
-                       (r"/docs/([A-Za-z0-9\-_\/]+)?/_(watch|unwatch)", docs.WatchHandler),
+                       (r"/docs(?:/([A-Za-z0-9\-_\/]+))?/_edit", docs.EditHandler),
+                       (r"/docs(?:/([A-Za-z0-9\-_\/]+))?/_render", docs.RenderHandler),
+                       (r"/docs(?:/([A-Za-z0-9\-_\/]+))?/_(watch|unwatch)", docs.WatchHandler),
                        (r"/docs/((?:[A-Za-z0-9\-_\/]+)?(?:.*)\.(?:\w+))/_delete", docs.DeleteFileHandler),
                        (r"/docs((?:[A-Za-z0-9\-_\/]+)?(?:.*)\.(?:\w+))$", docs.FileHandler),
-                       (r"/docs([A-Za-z0-9\-_\/]+)?/_files", docs.FilesHandler),
-                       (r"/docs([A-Za-z0-9\-_\/]+)?", docs.PageHandler),
+                       (r"/docs(?:/([A-Za-z0-9\-_\/]+))?/_files", docs.FilesHandler),
+                       (r"/docs(?:/([A-Za-z0-9\-_\/]+))?", docs.PageHandler),
 
                        # Downloads
                        (r"/downloads", downloads.IndexHandler),
@@ -162,10 +165,19 @@ class Application(tornado.web.Application):
                        (r"/donate/thank-you", donate.ThankYouHandler),
                        (r"/donate/error", donate.ErrorHandler),
 
+                       # Lists
+                       (r"/lists", lists.IndexHandler),
+
                        # Password Reset
                        (r"/password\-reset", auth.PasswordResetInitiationHandler),
                        (r"/password\-reset/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.PasswordResetHandler),
 
+                       # Projects
+                       (r"/projects/location", location.IndexHandler),
+                       (r"/projects/location/download", StaticHandler, { "template" : "../location/download.html" }),
+                       (r"/projects/location/how\-to\-use", StaticHandler, { "template" : "../location/how-to-use.html" }),
+                       (r"/projects/location/lookup/(.+)", location.LookupHandler),
+
                        # Single-Sign-On for Discourse
                        (r"/sso/discourse", auth.SSODiscourse),
 
@@ -192,6 +204,7 @@ class Application(tornado.web.Application):
                        (r"/about",  StaticHandler, { "template" : "about.html" }),
                        (r"/legal", StaticHandler, { "template" : "legal.html" }),
                        (r"/help", StaticHandler, { "template" : "help.html" }),
+                       (r"/sitemap",  StaticHandler, { "template" : "sitemap.html" }),
 
                        # API
                        (r"/api/check/email", auth.APICheckEmail),
@@ -314,14 +327,7 @@ class Application(tornado.web.Application):
 
                # location.ipfire.org
                self.add_handlers(r"location\.([a-z]+\.dev\.)?ipfire\.org", [
-                       (r"/", location.IndexHandler),
-                       (r"/download", StaticHandler, { "template" : "../location/download.html" }),
-                       (r"/how\-to\-use", StaticHandler, { "template" : "../location/how-to-use.html" }),
-                       (r"/lookup/(.+)/blacklists", location.BlacklistsHandler),
-                       (r"/lookup/(.+)", location.LookupHandler),
-
-                       # Serve any static files
-                       (r"/static/(.*)", tornado.web.StaticFileHandler, { "path" : self.settings.get("static_path") }),
+                       (r"/(.*)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/projects/location/{0}" }),
                ])
 
                # geoip.ipfire.org