[mark2] Fix ipgeo PHAL

Author: goldyfruit

ansible/roles/ovos_config/defaults/main.yml

@@ -59,6 +59,7 @@ ovos_config_virtualenv_directories:
 ovos_config_geoip_url: "{{ ovos_installer_geoip_url }}"
 ovos_config_geoip_enabled: "{{ ovos_installer_geoip_enabled | default(false) }}"
 ovos_config_geoip_timeout: 5
+ovos_config_mark2_network_tests_ip_url: "{{ ovos_installer_mark2_network_tests_ip_url }}"
 ovos_config_mycroft_conf_relpath: "{{ '.config/mycroft' if ovos_installer_method == 'virtualenv' else 'ovos/config' }}"
 ovos_config_mycroft_conf_mode: "0600"
 ovos_config_system_unit: "{{ ovos_installer_system_unit }}"

ansible/roles/ovos_config/templates/mycroft.conf.j2

@@ -100,6 +100,11 @@
     "host": "{{ '0.0.0.0' if ovos_installer_method == "containers" else '127.0.0.1' }}",
     "max_msg_size": 25
   },
+{% if 'tas5806' in ovos_installer_i2c_devices %}
+  "network_tests": {
+    "ip_url": "{{ ovos_config_mark2_network_tests_ip_url }}"
+  },
+{% endif %}
   "PHAL": {
     "admin": {
       "ovos-PHAL-plugin-system": {
@@ -119,7 +124,7 @@
       }
     },
     "ovos-phal-plugin-ipgeo": {
-      "enabled": false
+      "enabled": true
     }
 {% endif %}
   }{% if ovos_installer_usage_telemetry| bool %},

ansible/roles/ovos_installer/defaults/main.yml

@@ -136,6 +136,7 @@ ovos_installer_telemetry: "{{ ovos_installer_usage_telemetry | bool }}"
 ovos_installer_run_ovos_config: false
 ovos_installer_geoip_enabled: false
 ovos_installer_geoip_url: "https://ipapi.co/json/"
+ovos_installer_mark2_network_tests_ip_url: "https://ifconfig.me/ip"
 ovos_installer_system_unit: "metric"
 ovos_installer_temperature_unit: "celsius"
 ovos_installer_precipitation_unit: "mm"

tests/bats/code_quality.bats

@@ -265,16 +265,22 @@ function setup() {
     assert_failure
 }
 
-@test "mycroft_conf_disables_ipgeo_phal_plugin_for_mark2" {
+@test "mycroft_conf_enables_ipgeo_phal_plugin_and_sets_mark2_ip_lookup_url" {
     local conf_file="ansible/roles/ovos_config/templates/mycroft.conf.j2"
 
     run grep -F -q "{% if 'tas5806' in ovos_installer_i2c_devices %}" "$conf_file"
     assert_success
 
+    run grep -F -q "\"network_tests\": {" "$conf_file"
+    assert_success
+
+    run grep -F -q "\"ip_url\": \"{{ ovos_config_mark2_network_tests_ip_url }}\"" "$conf_file"
+    assert_success
+
     run grep -F -q "\"ovos-phal-plugin-ipgeo\": {" "$conf_file"
     assert_success
 
-    run bash -c "grep -A4 -F -- \"\\\"ovos-phal-plugin-ipgeo\\\": {\" \"$conf_file\" | grep -q -- \"\\\"enabled\\\": false\""
+    run bash -c "grep -A4 -F -- \"\\\"ovos-phal-plugin-ipgeo\\\": {\" \"$conf_file\" | grep -q -- \"\\\"enabled\\\": true\""
     assert_success
 }