from . import auth
from . import blog
from . import boot
+from . import docs
from . import donate
-from . import download
+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 wiki
+from . import users
+from . import voip
class Application(tornado.web.Application):
def __init__(self, config, **kwargs):
# UI Modules
"ui_modules" : {
+ # Auth
+ "Password" : auth.PasswordModule,
+
# Blog
"BlogHistoryNavigation": blog.HistoryNavigationModule,
"BlogList" : blog.ListModule,
"BootMenuHeader" : boot.MenuHeaderModule,
"BootMenuSeparator" : boot.MenuSeparatorModule,
- # People
- "AccountsList" : people.AccountsListModule,
- "Agent" : people.AgentModule,
- "CDR" : people.CDRModule,
- "Channels" : people.ChannelsModule,
- "MOS" : people.MOSModule,
- "NewAccounts" : people.NewAccountsModule,
- "Password" : people.PasswordModule,
- "Registrations" : people.RegistrationsModule,
+ # Docs
+ "DocsDiff" : docs.DiffModule,
+ "DocsHeader" : docs.HeaderModule,
+ "DocsList" : docs.ListModule,
# Nopaste
"Code" : nopaste.CodeModule,
"FireinfoDeviceAndGroupsTable"
: fireinfo.DeviceAndGroupsTableModule,
- # Wiki
- "WikiDiff" : wiki.WikiDiffModule,
- "WikiNavbar" : wiki.WikiNavbarModule,
- "WikiList" : wiki.WikiListModule,
+ # Users
+ "UsersList" : users.ListModule,
+
+ # VoIP
+ "VoIPConferences" : voip.ConferencesModule,
+ "VoIPOutboundRegistrations" :
+ voip.OutboundRegistrationsModule,
+ "VoIPQueues" : voip.QueuesModule,
+ "VoIPRegistrations" : voip.RegistrationsModule,
# Misc
"ChristmasBanner" : ui_modules.ChristmasBannerModule,
+ "IPFireLogo" : ui_modules.IPFireLogoModule,
"Markdown" : ui_modules.MarkdownModule,
"Map" : ui_modules.MapModule,
"ProgressBar" : ui_modules.ProgressBarModule,
(r"/logout", auth.LogoutHandler),
]
- self.add_handlers(r"(www\.)?(.*)ipfire\.org", [
+ self.add_handlers(r"(www\.)?([a-z]+\.dev\.)?ipfire\.org", [
# Entry site that lead the user to index
(r"/", IndexHandler),
- (r"/about", AboutHandler),
+
+ # Authentication
+ (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),
-
- # Download sites
- (r"/downloads", tornado.web.RedirectHandler, { "url" : "/download" }),
- (r"/download", download.IndexHandler),
- (r"/download/mirrors", download.MirrorsHandler),
- (r"/download/thank-you", download.ThankYouHandler),
- (r"/download/([0-9a-z\-\.]+)", download.ReleaseHandler),
+ (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\-_\/]+))?/_files", docs.FilesHandler),
+ (r"/docs(?:/([A-Za-z0-9\-_\/]+))?", docs.PageHandler),
+
+ # Downloads
+ (r"/downloads", downloads.IndexHandler),
+ (r"/downloads/mirrors", downloads.MirrorsHandler),
+ (r"/downloads/thank-you", downloads.ThankYouHandler),
+ (r"/downloads/([0-9a-z\-\.]+)", downloads.ReleaseHandler),
# Donate
(r"/donate", donate.DonateHandler),
(r"/donate/thank-you", donate.ThankYouHandler),
(r"/donate/error", donate.ErrorHandler),
- (r"/donation", tornado.web.RedirectHandler, { "url" : "/donate" }),
- # RSS feed
- (r"/news.rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }),
+ # 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),
- # Redirect news articles to blog
- (r"/news/(.*)", handlers.NewsHandler),
+ # 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),
+
+ # User Groups
+ (r"/users/groups", users.GroupIndexHandler),
+ (r"/users/groups/([a-z_][a-z0-9_-]{0,31})", users.GroupShowHandler),
+
+ # Users
+ (r"/users", users.IndexHandler),
+ (r"/users/([a-z_][a-z0-9_-]{0,31})", users.ShowHandler),
+ (r"/users/([a-z_][a-z0-9_-]{0,31})\.jpg", users.AvatarHandler),
+ (r"/users/([a-z_][a-z0-9_-]{0,31})/delete", users.DeleteHandler),
+ (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),
# Static Pages
- (r"/features", StaticHandler, { "template" : "features.html" }),
+ (r"/about", StaticHandler, { "template" : "about.html" }),
(r"/legal", StaticHandler, { "template" : "legal.html" }),
- (r"/support", StaticHandler, { "template" : "support.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}" }),
+ (r"/features", tornado.web.RedirectHandler, { "url" : "/about" }),
(r"/imprint", tornado.web.RedirectHandler, { "url" : "/legal" }),
- (r"/(de|en)/(.*)", LangCompatHandler),
+ (r"/news.rss", tornado.web.RedirectHandler, { "url" : "/blog/feed.xml" }),
+ (r"/news/(.*)", tornado.web.RedirectHandler, { "url" : "/blog/{0}" }),
+ (r"/support", tornado.web.RedirectHandler, { "url" : "/help"}),
+ (r"/(de|en)/(.*)", tornado.web.RedirectHandler, { "url" : "/{0}"}),
# Export arbitrary error pages
(r"/error/([45][0-9]{2})", base.ErrorHandler),
])
# blog.ipfire.org - LEGACY REDIRECTION
- self.add_handlers(r"blog\.(.*)ipfire\.org", [
+ self.add_handlers(r"blog\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/blog" }),
(r"/authors/(\w+)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/blog/authors/{0}" }),
(r"/post/([0-9a-z\-\._]+)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/blog/{0}" }),
])
# downloads.ipfire.org
- self.add_handlers(r"downloads\.(.*)ipfire\.org", [
+ self.add_handlers(r"downloads\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/download" }),
(r"/release/(.*)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/download/{0}" }),
- (r"/(.*)", download.FileHandler),
+ (r"/(.*)", downloads.FileHandler),
])
# mirrors.ipfire.org
- self.add_handlers(r"mirrors\.(.*)ipfire\.org", [
+ self.add_handlers(r"mirrors\.([a-z]+\.dev\.)?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
- self.add_handlers(r"planet\.(.*)ipfire\.org", [
+ self.add_handlers(r"planet\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/" }),
- (r"/post/([A-Za-z0-9_-]+)", handlers.PlanetPostHandler),
- (r"/user/([a-z0-9_-]+)", handlers.PlanetUserHandler),
+ (r"/post/([A-Za-z0-9_-]+)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/blog/{0}" }),
+ (r"/user/([a-z0-9_-]+)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/blog/authors/{0}" }),
# RSS
(r"/rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }),
])
# fireinfo.ipfire.org
- self.add_handlers(r"fireinfo\.(.*)ipfire\.org", [
+ self.add_handlers(r"fireinfo\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", fireinfo.IndexHandler),
# Admin
] + authentication_handlers)
# i-use.ipfire.org
- self.add_handlers(r"i-use\.(.*)ipfire\.org", [
+ self.add_handlers(r"i-use\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/" }),
(r"/profile/([a-f0-9]{40})/([0-9]+).png", iuse.ImageHandler),
])
# boot.ipfire.org
BOOT_STATIC_PATH = os.path.join(self.settings["static_path"], "netboot")
- self.add_handlers(r"boot\.(.*)ipfire\.org", [
+ self.add_handlers(r"boot\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", tornado.web.RedirectHandler, { "url" : "https://wiki.ipfire.org/installation/pxe" }),
# Configurations
])
# nopaste.ipfire.org
- self.add_handlers(r"nopaste\.(.*)ipfire\.org", [
+ self.add_handlers(r"nopaste\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", nopaste.CreateHandler),
(r"/raw/(.*)", nopaste.RawHandler),
(r"/view/(.*)", nopaste.ViewHandler),
] + authentication_handlers)
# location.ipfire.org
- self.add_handlers(r"location\.(.*)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") }),
+ self.add_handlers(r"location\.([a-z]+\.dev\.)?ipfire\.org", [
+ (r"/(.*)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/projects/location/{0}" }),
])
# geoip.ipfire.org
- self.add_handlers(r"geoip\.(.*)ipfire\.org", [
+ self.add_handlers(r"geoip\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", tornado.web.RedirectHandler, { "url" : "https://location.ipfire.org/" }),
])
# talk.ipfire.org
- self.add_handlers(r"talk\.(.*)ipfire\.org", [
+ self.add_handlers(r"talk\.([a-z]+\.dev\.)?ipfire\.org", [
(r"/", tornado.web.RedirectHandler, { "url" : "https://people.ipfire.org/" }),
])
# people.ipfire.org
- self.add_handlers(r"people\.(.*)ipfire\.org", [
- (r"/", people.IndexHandler),
- (r"/activate/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.ActivateHandler),
- (r"/conferences", people.ConferencesHandler),
- (r"/groups", people.GroupsHandler),
- (r"/groups/([a-z_][a-z0-9_-]{0,31})", people.GroupHandler),
- (r"/register", auth.RegisterHandler),
- (r"/search", people.SearchHandler),
- (r"/users", people.UsersHandler),
- (r"/users/([a-z_][a-z0-9_-]{0,31})", people.UserHandler),
- (r"/users/([a-z_][a-z0-9_-]{0,31})\.jpg", people.AvatarHandler),
- (r"/users/([a-z_][a-z0-9_-]{0,31})/calls/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})", people.CallHandler),
- (r"/users/([a-z_][a-z0-9_-]{0,31})/calls(?:/(\d{4}-\d{2}-\d{2}))?", people.CallsHandler),
- (r"/users/([a-z_][a-z0-9_-]{0,31})/edit", people.UserEditHandler),
- (r"/users/([a-z_][a-z0-9_-]{0,31})/passwd", people.UserPasswdHandler),
- (r"/users/([a-z_][a-z0-9_-]{0,31})/sip", people.SIPHandler),
-
- # Promotional Consent Stuff
- (r"/subscribe", people.SubscribeHandler),
- (r"/unsubscribe", people.UnsubscribeHandler),
-
- # Single-Sign-On for Discourse
- (r"/sso/discourse", people.SSODiscourse),
-
- # Password Reset
- (r"/password\-reset", auth.PasswordResetInitiationHandler),
- (r"/password\-reset/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.PasswordResetHandler),
-
- # Stats
- (r"/stats", people.StatsHandler),
-
- # 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)
+ self.add_handlers(r"people\.([a-z]+\.dev\.)?ipfire\.org", [
+ (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\.(.*)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),
- (r"((?!/static)(?:[A-Za-z0-9\-_\/]+)?(?:.*)\.(?:\w+))$", wiki.FileHandler),
-
- # Serve any static files
- (r"/static/(.*)", tornado.web.StaticFileHandler, { "path" : self.settings.get("static_path") }),
-
- # Render pages
- (r"([A-Za-z0-9\-_\/]+)?", wiki.PageHandler),
+ 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