Update fireinfo database hosts.

diff --git a/fireinfo/fireinfod b/fireinfo/fireinfod
index 75aadce9eb2c1b76cad16f37a064ea9ad436f629..510566827fa44ef78b3165ed983b4fc694074125 100755 (executable)
--- 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 21cb8a4162e99ffee051a0126f35dbe8a67feb7d..549d01878025c9f8f15b01433314e1a92ded6188 100644 (file)
--- 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)