From 4df928a66082ca8a3934c56d06eead32fd8af6b2 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 14 Jun 2023 09:03:25 +0200 Subject: [PATCH] fix --- database/seeders/InstanceSettingsSeeder.php | 19 +++++++++++++++++++ database/seeders/ProductionSeeder.php | 8 ++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/database/seeders/InstanceSettingsSeeder.php b/database/seeders/InstanceSettingsSeeder.php index 2e7c166d6..939b4820d 100644 --- a/database/seeders/InstanceSettingsSeeder.php +++ b/database/seeders/InstanceSettingsSeeder.php @@ -4,6 +4,7 @@ namespace Database\Seeders; use App\Models\InstanceSettings; use Illuminate\Database\Seeder; +use Illuminate\Support\Facades\Process; class InstanceSettingsSeeder extends Seeder { @@ -23,5 +24,23 @@ class InstanceSettingsSeeder extends Seeder 'smtp_from_name' => 'Coolify', ] ]); + try { + $ipv4 = Process::run('curl -4s https://ifconfig.io')->output(); + $ipv4 = trim($ipv4); + $ipv4 = filter_var($ipv4, FILTER_VALIDATE_IP); + $settings = InstanceSettings::get(); + if (is_null($settings->public_ipv4) && $ipv4) { + $settings->update(['public_ipv4' => $ipv4]); + } + $ipv6 = Process::run('curl -6s https://ifconfig.io')->output(); + $ipv6 = trim($ipv6); + $ipv6 = filter_var($ipv6, FILTER_VALIDATE_IP); + $settings = InstanceSettings::get(); + if (is_null($settings->public_ipv6) && $ipv6) { + $settings->update(['public_ipv6' => $ipv6]); + } + } catch (\Exception $e) { + echo "Error: {$e->getMessage()}\n"; + } } } diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php index 4e4bfaf8c..5d1825638 100644 --- a/database/seeders/ProductionSeeder.php +++ b/database/seeders/ProductionSeeder.php @@ -107,18 +107,18 @@ class ProductionSeeder extends Seeder ]); } try { - $ipv4 = Process::run('curl -4s https://ifconfig.io')->output; + $ipv4 = Process::run('curl -4s https://ifconfig.io')->output(); $ipv4 = trim($ipv4); $ipv4 = filter_var($ipv4, FILTER_VALIDATE_IP); $settings = InstanceSettings::get(); - if (is_null($settings->public_ipv4)) { + if (is_null($settings->public_ipv4) && $ipv4) { $settings->update(['public_ipv4' => $ipv4]); } - $ipv6 = Process::run('curl -6s https://ifconfig.io')->output; + $ipv6 = Process::run('curl -6s https://ifconfig.io')->output(); $ipv6 = trim($ipv6); $ipv6 = filter_var($ipv6, FILTER_VALIDATE_IP); $settings = InstanceSettings::get(); - if (is_null($settings->public_ipv6)) { + if (is_null($settings->public_ipv6) && $ipv6) { $settings->update(['public_ipv6' => $ipv6]); } } catch (\Exception $e) {