diff --git a/app/Models/InstanceSettings.php b/app/Models/InstanceSettings.php index 0f89bf409..0705ef1a1 100644 --- a/app/Models/InstanceSettings.php +++ b/app/Models/InstanceSettings.php @@ -32,24 +32,6 @@ class InstanceSettings extends Model implements SendsEmail } ); } - public static function realtimePort() - { - $envDefined = env('PUSHER_PORT'); - if ($envDefined != '6001') { - return $envDefined; - } - $url = Url::fromString(Request::getSchemeAndHttpHost()); - Log::info(Request::getSchemeAndHttpHost()); - Log::info($url); - $scheme = $url->getScheme(); - ray($url); - $port = $url->getPort(); - if ($port) { - return '6001'; - } else { - return null; - } - } public static function get() { return InstanceSettings::findOrFail(0); diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index eb219a568..f195446f8 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -30,6 +30,5 @@ class AppServiceProvider extends ServiceProvider ])->baseUrl($api_url); } }); - Config::set('coolify.realtime_port', \App\Models\InstanceSettings::realtimePort()); } } diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php index 4f0fda777..98cedf357 100644 --- a/bootstrap/helpers/shared.php +++ b/bootstrap/helpers/shared.php @@ -29,7 +29,9 @@ use Illuminate\Support\Collection; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\Http; +use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Mail; +use Illuminate\Support\Facades\Request; use Illuminate\Support\Facades\Route; use Illuminate\Support\Str; use Illuminate\Support\Stringable; @@ -1545,3 +1547,18 @@ function generateEnvValue(string $command) } return $generatedValue; } + +function getRealtime() { + $envDefined = env('PUSHER_PORT'); + if ($envDefined != '6001') { + return $envDefined; + } + $url = Url::fromString(Request::getSchemeAndHttpHost()); + Log::info(Request::getSchemeAndHttpHost()); + $port = $url->getPort(); + if ($port) { + return '6001'; + } else { + return null; + } +} diff --git a/config/coolify.php b/config/coolify.php index 955a2120a..05917d17a 100644 --- a/config/coolify.php +++ b/config/coolify.php @@ -2,7 +2,6 @@ return [ 'docs' => 'https://coolify.io/docs/contact', - 'realtime_port' => "6001", 'self_hosted' => env('SELF_HOSTED', true), 'waitlist' => env('WAITLIST', false), 'license_url' => 'https://licenses.coollabs.io', diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 559eb73b0..664ec7568 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -52,8 +52,8 @@ cluster: "{{ env('PUSHER_HOST') }}" || window.location.hostname, key: "{{ env('PUSHER_APP_KEY') }}" || 'coolify', wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname, - wsPort: "{{ config('coolify.realtime_port') }}", - wssPort: "{{ config('coolify.realtime_port') }}", + wsPort: "{{ getRealtime() }}", + wssPort: "{{ getRealtime() }}", forceTLS: false, encrypted: true, enableStats: false, diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php index f4c013c2c..6c43b7735 100644 --- a/resources/views/livewire/dashboard.blade.php +++ b/resources/views/livewire/dashboard.blade.php @@ -3,7 +3,7 @@ @endif

Dashboard

- Realtime Port: {{ config('coolify.realtime_port') ?? 'Not set' }} + Realtime Port: {{ getRealtime() ?? 'Not set' }}
Your self-hosted environment
@if (request()->query->get('success'))