Switch to Canonical's GeoIP service.

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

lubuntu/modules/locale.conf

@@ -3,6 +3,6 @@ region: "America"
 zone: "New_York"
 localeGenPath: "/etc/locale.gen"
 geoip:
-    style: "json"
+    style: "xml"
-    url:   "https://ipapi.co/json"
+    url:   "http://geoip.ubuntu.com/lookup"
-    selector: "timezone"
+    selector: "TimeZone"

lubuntu/modules/welcome.conf

@@ -21,5 +21,5 @@ requirements:
         - ram
 geoip:
     style:  "json"
-    url:    "https://ipapi.co/json"
+    url:    "http://geoip.ubuntu.com/lookup"
-    selector: "country"
+    selector: "CountryCode"

ubuntustudio/modules/locale.conf

@@ -3,6 +3,6 @@ region: "America"
 zone: "New_York"
 localeGenPath: "/etc/locale.gen"
 geoip:
-    style: "json"
+    style: "xml"
-    url:   "https://ipapi.co/json"
+    url:   "http://geoip.ubuntu.com/lookup"
-    selector: "timezone"
+    selector: "TimeZone"

ubuntustudio/modules/welcome.conf

@@ -20,6 +20,6 @@ requirements:
         - storage
         - ram
 geoip:
-    style:  "json"
+    style:  "xml"
-    url:    "https://ipapi.co/json"
+    url:    "http://geoip.ubuntu.com/lookup"
-    selector: "country"
+    selector: "CountryCode"