This is an automated email from the ASF dual-hosted git repository.
elsloo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit ec4dcfb6496cdbb55566bea4cbf4b74994255f38
Author: Jesse Rivas <jesse_ri...@comcast.com>
AuthorDate: Fri Feb 9 13:21:48 2018 -0700
documentation for maxmind.default.override parameter
---
docs/source/admin/traffic_ops/configuration.rst | 4 ++--
.../cdn/traffic_control/traffic_router/core/router/TrafficRouter.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/source/admin/traffic_ops/configuration.rst
b/docs/source/admin/traffic_ops/configuration.rst
index 720999e..ab77a50 100644
--- a/docs/source/admin/traffic_ops/configuration.rst
+++ b/docs/source/admin/traffic_ops/configuration.rst
@@ -158,8 +158,8 @@ Many of the settings for the different servers in a Traffic
Control CDN are cont
+--------------------------+---------------+---------------------------------------------------------------------------------------------------------------------------------------+
| geolocation6.polling.url | CRConfig.json | The location to get the IPv6
GeoLiteCity database from.
|
+--------------------------+---------------+---------------------------------------------------------------------------------------------------------------------------------------+
-| geolocation.default / | CRConfig.json | The country code and destination
geo coordinates to use when the geo database service returns a default
location. |
-| override | | Format:
<CountryCode>;<Lat>,<Long> Ex: US;37.751,-97.822
|
+| maxmind.default.override | CRConfig.json | The destination geo coordinates
to use for client location when maxmind returns a default location that matches
the country code. |
+| | | Format:
<CountryCode>;<Lat>,<Long> Ex: US;37.751,-97.822
|
+--------------------------+---------------+---------------------------------------------------------------------------------------------------------------------------------------+
These parameters should be set to reflect the local environment.
diff --git
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
index 471c8ea..9aee1cb 100644
---
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
+++
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
@@ -104,7 +104,7 @@ public class TrafficRouter {
this.zoneManager = new ZoneManager(this, statTracker,
trafficOpsUtils, trafficRouterManager);
if (cr.getConfig() != null) {
- // geolocationOverride: {countryCode: , lat: , long: }
+ // maxmindDefaultOverride: {countryCode: , lat: , long:
}
final JsonNode geolocations =
cr.getConfig().get("maxmindDefaultOverride");
if (geolocations != null) {
for (final JsonNode geolocation : geolocations)
{
--
To stop receiving notification emails like this one, please contact
els...@apache.org.
