From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 15 Jul 2012 09:25:36 +0000 (+0200)
Subject: Update fireinfo database hosts.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=962b5c9e5c5d76df05e78e7f2bff6e03f7c3d073;p=ipfire.org.git

Update fireinfo database hosts.
---

diff --git a/fireinfo/fireinfod b/fireinfo/fireinfod
index 75aadce9..51056682 100755
--- a/fireinfo/fireinfod
+++ b/fireinfo/fireinfod
@@ -14,7 +14,10 @@ import tornado.web
 
 import backend
 
-DATABASE_HOST = ["irma.ipfire.org", "madeye.ipfire.org"]
+DATABASE_HOST = [
+	"wilhelmina.ipfire.org",
+	"miranda.ipfire.org",
+]
 DATABASE_NAME = "stasy"
 
 DEFAULT_HOST = "www.ipfire.org"
@@ -301,7 +304,8 @@ class ProfileSendHandler(BaseHandler):
 		# Get GeoIP information if address is not defined in rfc1918
 		addr = ipaddr.IPAddress(self.request.remote_ip)
 		if not addr.is_private:
-			profile.geoip = self.geoip.get_all(self.request.remote_ip)
+			remote_ips = self.request.remote_ip.split(", ")
+			profile.geoip = self.geoip.get_all(remote_ips[-1])
 
 		# Move previous profiles to archive and keep only the latest one
 		# in profiles. This will make full table lookups faster.
diff --git a/www/webapp/backend/stasy.py b/www/webapp/backend/stasy.py
index 21cb8a41..549d0187 100644
--- a/www/webapp/backend/stasy.py
+++ b/www/webapp/backend/stasy.py
@@ -10,7 +10,7 @@ import re
 
 from misc import Singleton
 
-DATABASE_HOST = ["wilhelmina.ipfire.org"]
+DATABASE_HOST = ["wilhelmina.ipfire.org", "miranda.ipfire.org"]
 DATABASE_NAME = "stasy"
 
 CPU_SPEED_CONSTRAINTS = (0, 500, 1000, 1500, 2000, 2500, 3000, 3500)