This commit is contained in:
Andras Bacsai 2023-12-11 20:01:54 +01:00
parent 4f800f5331
commit d79da996d3
6 changed files with 20 additions and 23 deletions

View File

@ -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() public static function get()
{ {
return InstanceSettings::findOrFail(0); return InstanceSettings::findOrFail(0);

View File

@ -30,6 +30,5 @@ class AppServiceProvider extends ServiceProvider
])->baseUrl($api_url); ])->baseUrl($api_url);
} }
}); });
Config::set('coolify.realtime_port', \App\Models\InstanceSettings::realtimePort());
} }
} }

View File

@ -29,7 +29,9 @@ use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Mail; use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Illuminate\Support\Stringable; use Illuminate\Support\Stringable;
@ -1545,3 +1547,18 @@ function generateEnvValue(string $command)
} }
return $generatedValue; 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;
}
}

View File

@ -2,7 +2,6 @@
return [ return [
'docs' => 'https://coolify.io/docs/contact', 'docs' => 'https://coolify.io/docs/contact',
'realtime_port' => "6001",
'self_hosted' => env('SELF_HOSTED', true), 'self_hosted' => env('SELF_HOSTED', true),
'waitlist' => env('WAITLIST', false), 'waitlist' => env('WAITLIST', false),
'license_url' => 'https://licenses.coollabs.io', 'license_url' => 'https://licenses.coollabs.io',

View File

@ -52,8 +52,8 @@
cluster: "{{ env('PUSHER_HOST') }}" || window.location.hostname, cluster: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
key: "{{ env('PUSHER_APP_KEY') }}" || 'coolify', key: "{{ env('PUSHER_APP_KEY') }}" || 'coolify',
wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname, wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
wsPort: "{{ config('coolify.realtime_port') }}", wsPort: "{{ getRealtime() }}",
wssPort: "{{ config('coolify.realtime_port') }}", wssPort: "{{ getRealtime() }}",
forceTLS: false, forceTLS: false,
encrypted: true, encrypted: true,
enableStats: false, enableStats: false,

View File

@ -3,7 +3,7 @@
<span x-data x-init="$wire.emit('error', '{{ session('error') }}')" /> <span x-data x-init="$wire.emit('error', '{{ session('error') }}')" />
@endif @endif
<h1>Dashboard</h1> <h1>Dashboard</h1>
Realtime Port: {{ config('coolify.realtime_port') ?? 'Not set' }} Realtime Port: {{ getRealtime() ?? 'Not set' }}
<div class="subtitle">Your self-hosted environment</div> <div class="subtitle">Your self-hosted environment</div>
@if (request()->query->get('success')) @if (request()->query->get('success'))