From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 17 Jan 2010 10:33:56 +0000 (+0100)
Subject: Make use of info.json.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d979645d82fc584e27e39e6856fc76a77db574c8;p=ipfire.org.git

Make use of info.json.
---

diff --git a/www/webapp/builds.py b/www/webapp/builds.py
index 496c7494..49dbaceb 100644
--- a/www/webapp/builds.py
+++ b/www/webapp/builds.py
@@ -4,14 +4,18 @@ import os
 import time
 
 from helpers import size
-
-BUILD_HOME = "/srv/anonftp/pub/nightly-builds"
+from info import info
 
 def find():
 	ret = []
-	for host in os.listdir(BUILD_HOME):
-		for build in os.listdir(os.path.join(BUILD_HOME, host)):
-			ret.append(Build(os.path.join(BUILD_HOME, host, build)))
+	for item in info["nightly_builds"]:
+		path = item.get("path", None)
+		if not path or not os.path.exists(path):
+			continue
+
+		for host in os.listdir(path):
+			for build in os.listdir(os.path.join(path, host)):
+				ret.append(Build(os.path.join(path, host, build)))
 
 	return ret
 
diff --git a/www/webapp/handlers.py b/www/webapp/handlers.py
index b4ee0a90..b936c67d 100644
--- a/www/webapp/handlers.py
+++ b/www/webapp/handlers.py
@@ -11,6 +11,7 @@ import tornado.locale
 import tornado.web
 
 from banners import banners
+from info import info
 from news import news
 from releases import releases
 
@@ -193,7 +194,7 @@ class ApiClusterInfoHandler(BaseHandler):
 	def get(self):
 		id = self.get_argument("id", "null")
 
-		c = cluster.Cluster("minerva.ipfire.org")
+		c = cluster.Cluster(info["cluster"]["hostname"])
 
 		self.write(simplejson.dumps({
 			"version": "1.1",