from . import downloads
from . import fireinfo
from . import iuse
+from . import lists
from . import location
from . import nopaste
-from . import people
from . import ui_modules
from . import users
from . import voip
-from . import wiki
class Application(tornado.web.Application):
def __init__(self, config, **kwargs):
"BootMenuSeparator" : boot.MenuSeparatorModule,
# Docs
+ "DocsDiff" : docs.DiffModule,
"DocsHeader" : docs.HeaderModule,
+ "DocsList" : docs.ListModule,
# Nopaste
"Code" : nopaste.CodeModule,
"VoIPQueues" : voip.QueuesModule,
"VoIPRegistrations" : voip.RegistrationsModule,
- # Wiki
- "WikiDiff" : wiki.WikiDiffModule,
- "WikiList" : wiki.WikiListModule,
-
# Misc
"ChristmasBanner" : ui_modules.ChristmasBannerModule,
+ "IPFireLogo" : ui_modules.IPFireLogoModule,
"Markdown" : ui_modules.MarkdownModule,
"Map" : ui_modules.MapModule,
"ProgressBar" : ui_modules.ProgressBarModule,
(r"/login", auth.LoginHandler),
(r"/logout", auth.LogoutHandler),
(r"/register", auth.RegisterHandler),
+ (r"/activate/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.ActivateHandler),
# Blog
(r"/blog", blog.IndexHandler),
- (r"/blog/authors/(\w+)", blog.AuthorHandler),
- (r"/blog/compose", blog.ComposeHandler),
(r"/blog/drafts", blog.DraftsHandler),
(r"/blog/feed.xml", blog.FeedHandler),
- (r"/blog/search", blog.SearchHandler),
(r"/blog/tags/([0-9a-z\-\.]+)", blog.TagHandler),
+ (r"/blog/write", blog.WriteHandler),
(r"/blog/years/([0-9]{4})", blog.YearHandler),
(r"/blog/([0-9a-z\-\._]+)", blog.PostHandler),
(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),
+ (r"/docs/search", docs.SearchHandler),
+ (r"/docs/tree", docs.TreeHandler),
+ (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\-_\/]+)?(?:.*)\.(?:\w+))/_delete", docs.DeleteFileHandler),
(r"/docs((?:[A-Za-z0-9\-_\/]+)?(?:.*)\.(?:\w+))$", docs.FileHandler),
- (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),
(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),
(r"/users/([a-z_][a-z0-9_-]{0,31})/edit", users.EditHandler),
(r"/users/([a-z_][a-z0-9_-]{0,31})/passwd", users.PasswdHandler),
+ # Promotional Consent Stuff
+ (r"/subscribe", users.SubscribeHandler),
+ (r"/unsubscribe", users.UnsubscribeHandler),
+
# VoIP
(r"/voip", voip.IndexHandler),
(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),
+ (r"/api/check/uid", auth.APICheckUID),
# Handle old pages that have moved elsewhere
+ (r"/blog/authors/(\w+)", tornado.web.RedirectHandler, { "url" : "/users/{0}" }),
(r"/donation", tornado.web.RedirectHandler, { "url" : "/donate" }),
(r"/download", tornado.web.RedirectHandler, { "url" : "/downloads" }),
(r"/download/([0-9a-z\-\.]+)", tornado.web.RedirectHandler, { "url" : "/downloads/{0}" }),
# 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
# people.ipfire.org
self.add_handlers(r"people\.([a-z]+\.dev\.)?ipfire\.org", [
- (r"/", people.IndexHandler),
- (r"/activate/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.ActivateHandler),
- (r"/register", auth.RegisterHandler),
-
- # Promotional Consent Stuff
- (r"/subscribe", people.SubscribeHandler),
- (r"/unsubscribe", people.UnsubscribeHandler),
-
- # Serve any static files
- (r"/static/(.*)", tornado.web.StaticFileHandler, { "path" : self.settings.get("static_path") }),
-
- # API
- (r"/api/check/email", auth.APICheckEmail),
- (r"/api/check/uid", auth.APICheckUID),
- ] + authentication_handlers)
+ (r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/users" }),
+ (r"/register", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/register" }),
+ (r"/users", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/users" }),
+ (r"/users/([a-z_][a-z0-9_-]{0,31})", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/users/{0}" }),
+ (r"/users/([a-z_][a-z0-9_-]{0,31})\.jpg", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/users/{0}.jpg" }),
+ ])
# wiki.ipfire.org
- self.add_handlers(r"wiki\.([a-z]+\.dev\.)?ipfire\.org",
- authentication_handlers + [
-
- # Actions
- (r"((?:[A-Za-z0-9\-_\/]+)?(?:.*)\.(?:\w+))/_delete", wiki.ActionDeleteHandler),
- (r"([A-Za-z0-9\-_\/]+)?/_edit", wiki.ActionEditHandler),
- (r"([A-Za-z0-9\-_\/]+)?/_render", wiki.ActionRenderHandler),
- (r"([A-Za-z0-9\-_\/]+)?/_(watch|unwatch)", wiki.ActionWatchHandler),
- (r"/actions/restore", wiki.ActionRestoreHandler),
- (r"/actions/upload", wiki.ActionUploadHandler),
-
- # Handlers
- (r"/recent\-changes", wiki.RecentChangesHandler),
- (r"/search", wiki.SearchHandler),
- (r"/tree", wiki.TreeHandler),
- (r"/watchlist", wiki.WatchlistHandler),
-
- # Media
- (r"([A-Za-z0-9\-_\/]+)?/_files", wiki.FilesHandler),
-
- # Serve any static files
- (r"/static/(.*)", tornado.web.StaticFileHandler, { "path" : self.settings.get("static_path") }),
-
- # Render pages
- (r"([A-Za-z0-9\-_\/]+)?", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/docs{0}" }),
+ self.add_handlers(r"wiki\.([a-z]+\.dev\.)?ipfire\.org", [
+ (r"/(.*)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/docs/{0}" }),
])
# ipfire.org
projects / ipfire.org.git / blobdiff