Lubuntu: Fix GeoIP parsing

Summary:
With the recent switch of the GeoIP service, the format has also changed from
JSON to XML. This was not correctly changed in the welcome module for Lubuntu.

Test Plan:
1. Start Calamares (e.g. with an IP address from Europe).
2. Check, that the language is set correctly (e.g. French when in France).

Reviewers: wxl, tsimonq2, kc2bez

Reviewed By: wxl, kc2bez

Differential Revision: https://phab.lubuntu.me/D101
ubuntu/hirsute
apt-ghetto 4 years ago committed by Dan Simmons
parent b0ae6f47ed
commit 63230172e4

7
debian/changelog vendored

@ -1,3 +1,10 @@
calamares-settings-ubuntu (1:21.04.1) hirsute; urgency=medium
* Fix GeoIP parsing for Lubuntu in welcome module.
* Use https for the GeoIP lookup
-- apt-ghetto <apt-ghetto@lubuntu.me> Sat, 24 Oct 2020 10:47:15 +0200
calamares-settings-ubuntu (1:20.10.11) groovy; urgency=medium calamares-settings-ubuntu (1:20.10.11) groovy; urgency=medium
* Switch to Canonical's GeoIP service. * Switch to Canonical's GeoIP service.

@ -4,5 +4,5 @@ zone: "New_York"
localeGenPath: "/etc/locale.gen" localeGenPath: "/etc/locale.gen"
geoip: geoip:
style: "xml" style: "xml"
url: "http://geoip.ubuntu.com/lookup" url: "https://geoip.ubuntu.com/lookup"
selector: "TimeZone" selector: "TimeZone"

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

@ -4,5 +4,5 @@ zone: "New_York"
localeGenPath: "/etc/locale.gen" localeGenPath: "/etc/locale.gen"
geoip: geoip:
style: "xml" style: "xml"
url: "http://geoip.ubuntu.com/lookup" url: "https://geoip.ubuntu.com/lookup"
selector: "TimeZone" selector: "TimeZone"

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

Loading…
Cancel
Save