From e30e228b83249131bf875fd1210521592002969f Mon Sep 17 00:00:00 2001
From: Simon Quigley <simon@tsimonq2.net>
Date: Wed, 14 Oct 2020 18:23:36 -0500
Subject: [PATCH] Switch to Canonical's GeoIP service.

---
 debian/changelog             | 6 ++++++
 lubuntu/modules/locale.conf  | 6 +++---
 lubuntu/modules/welcome.conf | 4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61efcb5..fc76977 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+calamares-settings-ubuntu (1:20.10.2.1) UNRELEASED; urgency=medium
+
+  * Switch to Canonical's GeoIP service (LP: #1899854).
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 14 Oct 2020 18:22:54 -0500
+
 calamares-settings-ubuntu (1:20.04.2) focal; urgency=medium
 
   * Add shellprocess to implement i386 multiarch.
diff --git a/lubuntu/modules/locale.conf b/lubuntu/modules/locale.conf
index 3004702..1b72f6a 100644
--- 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"
diff --git a/lubuntu/modules/welcome.conf b/lubuntu/modules/welcome.conf
index 69022a2..85bab77 100644
--- 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"