From 01c0bcafc8f3b7c089a7e7d9a6ca2cb4b793e009 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 ++--
 ubuntustudio/modules/locale.conf  | 6 +++---
 ubuntustudio/modules/welcome.conf | 6 +++---
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d21b52..d8168e9 100644
--- 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
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"
diff --git a/ubuntustudio/modules/locale.conf b/ubuntustudio/modules/locale.conf
index 3004702..1b72f6a 100644
--- 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"
diff --git a/ubuntustudio/modules/welcome.conf b/ubuntustudio/modules/welcome.conf
index 6e3214f..59662e5 100644
--- 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"