Only use if.siveo.net by default for the geolocalisation

medulla-tech · Jan 8, 2025 · 2a3229e · 2a3229e
1 parent 4e2e7b4
commit 2a3229e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - [BUGFIX]   Windows installer removes previous packages folder to avoid installation errors
 - [BUGFIX]   Fix reconnection of the agent when the ARS or ejabberd goes down
 - [BUGFIX]   Add the Medulla icon to the list of applications under Windows
+- [BUGFIX]   Only use if.siveo.net by default for the geolocalisation
 
 [Full Changelog](https://github.com/medulla-tech/medulla-agent/compare/v3.1.1...v3.2.0)
 

diff --git a/pulse_xmpp_agent/config/agentconf.ini b/pulse_xmpp_agent/config/agentconf.ini
@@ -34,7 +34,7 @@ guacamole_baseurl =
 # Setting this parameter to False will have no effect if agent_space = public
 # geolocalisation = True
 # Geolocalisation servers list
-# geoservers = ifconfig.co, if.siveo.net
+# geoservers = if.siveo.net
 # Define if the ssh user is part of administrators group
 sshuser_isadmin = False
 

diff --git a/pulse_xmpp_agent/config/relayconf.ini b/pulse_xmpp_agent/config/relayconf.ini
@@ -29,7 +29,7 @@ guacamole_baseurl = @@GUACAMOLE_BASEURL@@
 # Enable geolocalisation for relayservers. Set to False to disable geolocalisation
 # geolocalisation = True
 # Geolocalisation servers list
-# geoservers = ifconfig.co, if.siveo.net
+# geoservers = if.siveo.net
 
 [plugin]
 # Plugins configs to be loaded

diff --git a/pulse_xmpp_agent/connectionagent.py b/pulse_xmpp_agent/connectionagent.py
@@ -140,7 +140,7 @@ def __init__(self, conf):
         handler_sleekxmpp.setLevel(self.config.log_level_slixmpp)
 
         if not hasattr(self.config, "geoservers"):
-            self.geoservers = "ifconfig.co, if.siveo.net"
+            self.geoservers = "if.siveo.net"
 
         self.ippublic = None
         self.geodata = None

diff --git a/pulse_xmpp_agent/lib/configuration.py b/pulse_xmpp_agent/lib/configuration.py
@@ -669,7 +669,7 @@ def __init__(self, typeconf="machine"):
                 self.packageserver["port"] = int(packageserver["port"])
         self.public_ip = ""
         self.public_ip_relayserver = ""
-        self.geoservers = "ifconfig.co, if.siveo.net"
+        self.geoservers = "if.siveo.net"
         self.geolocalisation = True
 
         if Config.has_option("type", "public_ip"):

diff --git a/pulse_xmpp_agent/lib/utils.py b/pulse_xmpp_agent/lib/utils.py
@@ -1952,7 +1952,7 @@ def subnetnetwork(adressmachine, mask):
 def searchippublic(site=1):
     if site == 1:
         try:
-            objip = json.loads(urllib.urlopen("http://ifconfig.co/json"))
+            objip = json.loads(urllib.urlopen("http://if.siveo.net/json"))
             return objip["ip"] if is_valid_ipv4(objip["ip"]) else searchippublic(2)
         except BaseException:
             return searchippublic(2)