move skip IPs configuration to preflight settings (alexjustesen#2557)

Co-authored-by: Alex Justesen <[email protected]>

Author: alexjustesen

app/Jobs/Ookla/SkipSpeedtestJob.php

@@ -92,11 +92,11 @@ private function shouldSkip(string $externalIp): bool|string
         $skipIPs = array_filter(
             array_map(
                 'trim',
-                explode(',', config('speedtest.skip_ips')),
+                explode(',', config('speedtest.preflight.skip_ips')),
             ),
         );
 
-        if (count($skipIPs) < 1) {
+        if (empty($skipIPs)) {
             return false;
         }
 

config/speedtest.php

@@ -32,15 +32,14 @@
     'preflight' => [
         'external_ip_url' => env('SPEEDTEST_CHECKINTERNET_URL') ?? env('SPEEDTEST_EXTERNAL_IP_URL', 'https://icanhazip.com'),
         'internet_check_hostname' => env('SPEEDTEST_CHECKINTERNET_URL') ?? env('SPEEDTEST_INTERNET_CHECK_HOSTNAME', 'icanhazip.com'),
+        'skip_ips' => env('SPEEDTEST_SKIP_IPS'),
     ],
 
     /**
      * IP filtering settings.
      */
     'allowed_ips' => env('ALLOWED_IPS'),
 
-    'skip_ips' => env('SPEEDTEST_SKIP_IPS', ''),
-
     /**
      * Threshold settings.
      */