napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cross-reference/clarify geoip documentation

Browse Source
This commit is contained in:
bill-auger 2019-08-28 07:38:49 -04:00
parent 559a65d169
commit 5642576cf3
No known key found for this signature in database
GPG Key ID: 908710913E8C7778
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/locale/LocaleViewStep.cpp
View File

@ -235,7 +235,7 @@ LocaleViewStep::setConfigurationMap( const QVariantMap& configurationMap )
} }
else else
{ {
// Optional // Accommodate deprecated geoip configuration
m_geoipUrl = CalamaresUtils::getString( configurationMap, "geoipUrl" ); m_geoipUrl = CalamaresUtils::getString( configurationMap, "geoipUrl" );
m_geoipStyle = CalamaresUtils::getString( configurationMap, "geoipStyle" ); m_geoipStyle = CalamaresUtils::getString( configurationMap, "geoipStyle" );
m_geoipSelector = CalamaresUtils::getString( configurationMap, "geoipSelector" ); m_geoipSelector = CalamaresUtils::getString( configurationMap, "geoipSelector" );

8
src/modules/locale/locale.conf
View File

@ -23,6 +23,7 @@ zone: "New_York"
# #
# Enable only when your Distribution is using an # Enable only when your Distribution is using an
# custom path for locale.gen # custom path for locale.gen
#
#localeGenPath: "PATH_TO/locale.gen" #localeGenPath: "PATH_TO/locale.gen"
# GeoIP based Language settings: Leave commented out to disable GeoIP. # GeoIP based Language settings: Leave commented out to disable GeoIP.
@ -78,13 +79,18 @@ zone: "New_York"
# <Response><TimeZone>Europe/Brussels</TimeZone></Response> # <Response><TimeZone>Europe/Brussels</TimeZone></Response>
# ``` # ```
# #
# To accomodate providers of GeoIP timezone data with peculiar timezone # To accommodate providers of GeoIP timezone data with peculiar timezone
# naming conventions, the following cleanups are performed automatically: # naming conventions, the following cleanups are performed automatically:
# - backslashes are removed # - backslashes are removed
# - spaces are replaced with _ # - spaces are replaced with _
# #
# Legacy settings "geoipStyle", "geoipUrl" and "geoipSelector" # Legacy settings "geoipStyle", "geoipUrl" and "geoipSelector"
# in the top-level are still supported, but I'd advise against. # in the top-level are still supported, but I'd advise against.
#
# To disable GeoIP checking, either comment-out the entire geoip section,
# or set the *style* key to an unsupported format (e.g. `none`).
# Also, note the analogous feature in src/modules/welcome/welcome.conf.
#
geoip: geoip:
style: "json" style: "json"
url: "https://geoip.kde.org/v1/calamares" url: "https://geoip.kde.org/v1/calamares"

8
src/modules/welcome/welcome.conf
View File

@ -69,10 +69,10 @@ requirements:
# but remember to use a URL that returns full data **and** to # but remember to use a URL that returns full data **and** to
# use a selector that will pick the country, not the timezone. # use a selector that will pick the country, not the timezone.
# #
# To disable, either comment-out the entire section, or set # To disable GeoIP checking, either comment-out the entire geoip section,
# the *style* key to an unsupported format (e.g. `none`, as is # or set the *style* key to an unsupported format (e.g. `none`).
# done here). # Also, note the analogous feature in src/modules/locale/locale.conf.
#
geoip: geoip:
style: "none" style: "none"
url: "https://geoip.kde.org/v1/ubiquity" # extended XML format url: "https://geoip.kde.org/v1/ubiquity" # extended XML format