delete old ipfire v2.3 devel links and add new v3 alpha 1 link to download.xml

[ipfire.org.git] / www / index.py

diff --git a/www/index.py b/www/index.py
index 8463bfe775eb64beaf37fb4fe75a87065642c331..2e299052902c0d7a820de1d19ebc188f39507c7c 100755 (executable)
--- a/www/index.py
+++ b/www/index.py
@@ -4,14 +4,6 @@ import os
 import re
 import cgi
 
-sites = (
-                       ("ipfire.org", ("www.ipfire.org", None)),
-                       ("www.ipfire.org", (None, cgi.FieldStorage().getfirst("file") or "index")),
-                       ("source.ipfire.org", (None, "source.shtml")),
-                       ("tracker.ipfire.org", (None, "tracker.shtml")),
-                       ("download.ipfire.org", (None, "download.shtml")),
-               )
-
 # Check language...
 language = "en"
 try:
@@ -20,6 +12,17 @@ try:
 except KeyError:
        pass
 
+index = cgi.FieldStorage().getfirst("file") or "index"
+
+sites = (
+                       ("ipfire.org", ("www.ipfire.org", None)),
+                       ("www.ipfire.org", (None, index + "/%s" % language)),
+                       ("source.ipfire.org", ("www.ipfire.org", "source/" + language)),
+                       ("tracker.ipfire.org", ("www.ipfire.org", "tracker/" + language)),
+                       ("download.ipfire.org", ("www.ipfire.org", "download/" + language)),
+                       ("people.ipfire.org", ("wiki.ipfire.org", language + "/people/start")),
+               )
+
 print "Status: 302 Moved"
 print "Pragma: no-cache"
 
@@ -30,7 +33,7 @@ for (servername, destination) in sites:
                if destination[0]:
                        location = "http://%s" % destination[0]
                if destination[1]:
-                       location += "/%s/%s" % (destination[1], language,)
+                       location += "/%s" % destination[1]
                break
 
 print "Location: %s" % location