From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 15 Jul 2012 18:49:05 +0000 (+0200)
Subject: Make download.ipfire.org an alias for downloads.ipfire.org.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2db020636c56107ce75385e3e0acc59d6c1dacda;p=ipfire.org.git

Make download.ipfire.org an alias for downloads.ipfire.org.
---

diff --git a/www/webapp/__init__.py b/www/webapp/__init__.py
index a8656d0f..0bc72936 100644
--- a/www/webapp/__init__.py
+++ b/www/webapp/__init__.py
@@ -89,7 +89,7 @@ class Application(tornado.web.Application):
 		])
 
 		# downloads.ipfire.org
-		self.add_handlers(r"downloads\.ipfire\.org", [
+		self.add_handlers(r"downloads?\.ipfire\.org", [
 			(r"/", DownloadsIndexHandler),
 			(r"/latest", DownloadsLatestHandler),
 			(r"/release/([0-9]+)", DownloadsReleaseHandler),
@@ -102,9 +102,6 @@ class Application(tornado.web.Application):
 			(r"/(iso|torrent)/(.*)", DownloadCompatHandler),
 			(r"/(.*)", DownloadFileHandler),
 		])
-		self.add_handlers(r"download\.ipfire\.org", [
-			(r".*", tornado.web.RedirectHandler, { "url" : "http://downloads.ipfire.org" })
-		])
 
 		# mirrors.ipfire.org
 		self.add_handlers(r"mirrors\.ipfire\.org", [