fix
This commit is contained in:
parent
4f800f5331
commit
d79da996d3
@ -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);
|
||||
|
@ -30,6 +30,5 @@ class AppServiceProvider extends ServiceProvider
|
||||
])->baseUrl($api_url);
|
||||
}
|
||||
});
|
||||
Config::set('coolify.realtime_port', \App\Models\InstanceSettings::realtimePort());
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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',
|
||||
|
@ -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,
|
||||
|
@ -3,7 +3,7 @@
|
||||
<span x-data x-init="$wire.emit('error', '{{ session('error') }}')" />
|
||||
@endif
|
||||
<h1>Dashboard</h1>
|
||||
Realtime Port: {{ config('coolify.realtime_port') ?? 'Not set' }}
|
||||
Realtime Port: {{ getRealtime() ?? 'Not set' }}
|
||||
|
||||
<div class="subtitle">Your self-hosted environment</div>
|
||||
@if (request()->query->get('success'))
|
||||
|
Loading…
x
Reference in New Issue
Block a user