Switch to Canonical's GeoIP service.

2025-05-14 03:51:30 +00:00 · 2020-10-14 18:23:36 -05:00 · 2020-10-14 18:23:36 -05:00 · 01c0bcafc8
commit 01c0bcafc8
parent d6982b94e5
5 changed files with 17 additions and 11 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,9 @@
+calamares-settings-ubuntu (1:20.10.11) UNRELEASED; urgency=medium
+
+  * Switch to Canonical's GeoIP service.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 14 Oct 2020 18:22:54 -0500
+
 calamares-settings-ubuntu (1:20.10.10) groovy; urgency=medium

  * Lowered Ubuntu Studio RAM requirements due to popular demand/confusion
--- a/lubuntu/modules/locale.conf
+++ b/lubuntu/modules/locale.conf
@ -3,6 +3,6 @@ region: "America"
 zone: "New_York"
 localeGenPath: "/etc/locale.gen"
 geoip:
-    style: "json"
-    url:   "https://ipapi.co/json"
-    selector: "timezone"
+    style: "xml"
+    url:   "http://geoip.ubuntu.com/lookup"
+    selector: "TimeZone"
--- a/lubuntu/modules/welcome.conf
+++ b/lubuntu/modules/welcome.conf
@ -21,5 +21,5 @@ requirements:
        - ram
 geoip:
    style:  "json"
-    url:    "https://ipapi.co/json"
-    selector: "country"
+    url:    "http://geoip.ubuntu.com/lookup"
+    selector: "CountryCode"
--- a/ubuntustudio/modules/locale.conf
+++ b/ubuntustudio/modules/locale.conf
@ -3,6 +3,6 @@ region: "America"
 zone: "New_York"
 localeGenPath: "/etc/locale.gen"
 geoip:
-    style: "json"
-    url:   "https://ipapi.co/json"
-    selector: "timezone"
+    style: "xml"
+    url:   "http://geoip.ubuntu.com/lookup"
+    selector: "TimeZone"
--- a/ubuntustudio/modules/welcome.conf
+++ b/ubuntustudio/modules/welcome.conf
@ -20,6 +20,6 @@ requirements:
        - storage
        - ram
 geoip:
-    style:  "json"
-    url:    "https://ipapi.co/json"
-    selector: "country"
+    style:  "xml"
+    url:    "http://geoip.ubuntu.com/lookup"
+    selector: "CountryCode"