dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: websocket

Browse Source
This commit is contained in:
Andras Bacsai
2023-12-11 18:48:00 +01:00
parent 17c8872130
commit 6d9a66ff1b
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bootstrap/helpers/proxy.php
View File

@@ -184,13 +184,13 @@ function setup_dynamic_configuration()
'service' => 'coolify', 'service' => 'coolify',
'rule' => "Host(`{$host}`)", 'rule' => "Host(`{$host}`)",
], ],
'coolify-ws' => 'coolify-realtime-ws' =>
[ [
'entryPoints' => [ 'entryPoints' => [
0 => 'http', 0 => 'http',
], ],
'service' => 'coolify-realtime', 'service' => 'coolify-realtime',
'rule' => "Host(`{$host}`) && PathPrefix(`/realtime/`)", 'rule' => "Host(`{$host}`) && PathPrefix(`/app`)",
], ],
], ],
'services' => 'services' =>
@@ -229,7 +229,7 @@ function setup_dynamic_configuration()
$traefik_dynamic_conf['http']['routers']['coolify-http']['middlewares'] = [ $traefik_dynamic_conf['http']['routers']['coolify-http']['middlewares'] = [
0 => 'redirect-to-https@docker', 0 => 'redirect-to-https@docker',
]; ];
$traefik_dynamic_conf['http']['routers']['coolify-ws']['middlewares'] = [ $traefik_dynamic_conf['http']['routers']['coolify-realtime-ws']['middlewares'] = [
0 => 'redirect-to-https@docker', 0 => 'redirect-to-https@docker',
]; ];
$traefik_dynamic_conf['http']['routers']['coolify-https'] = [ $traefik_dynamic_conf['http']['routers']['coolify-https'] = [
@@ -242,12 +242,12 @@ function setup_dynamic_configuration()
'certresolver' => 'letsencrypt', 'certresolver' => 'letsencrypt',
], ],
]; ];
$traefik_dynamic_conf['http']['routers']['coolify-wss'] = [ $traefik_dynamic_conf['http']['routers']['coolify-realtime-wss'] = [
'entryPoints' => [ 'entryPoints' => [
0 => 'https', 0 => 'https',
], ],
'service' => 'coolify-realtime', 'service' => 'coolify-realtime',
'rule' => "Host(`{$host}`) && PathPrefix(`/realtime/`)", 'rule' => "Host(`{$host}`) && PathPrefix(`/app`)",
'tls' => [ 'tls' => [
'certresolver' => 'letsencrypt', 'certresolver' => 'letsencrypt',
], ],

1
docker-compose.dev.yml
View File

@@ -57,7 +57,6 @@ services:
- "${FORWARD_SOKETI_PORT:-6001}:6001" - "${FORWARD_SOKETI_PORT:-6001}:6001"
environment: environment:
SOKETI_DEBUG: "true" SOKETI_DEBUG: "true"
SOKETI_PATH_PREFIX: "${PUSHER_PATH_PREFIX:-/realtime}"
SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID:-coolify}" SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID:-coolify}"
SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY:-coolify}" SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}" SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}"

1
docker-compose.prod.yml
View File

@@ -124,7 +124,6 @@ services:
- "${SOKETI_PORT:-6001}:6001" - "${SOKETI_PORT:-6001}:6001"
environment: environment:
SOKETI_DEBUG: "${SOKETI_DEBUG:-false}" SOKETI_DEBUG: "${SOKETI_DEBUG:-false}"
SOKETI_PATH_PREFIX: "${PUSHER_PATH_PREFIX:-/realtime}"
SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID}" SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID}"
SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}" SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"
SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET}" SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET}"

1
resources/views/layouts/base.blade.php
View File

@@ -54,7 +54,6 @@
wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname, wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
wsPort: "{{ App\Models\InstanceSettings::realtimePort() }}", wsPort: "{{ App\Models\InstanceSettings::realtimePort() }}",
wssPort: "{{ App\Models\InstanceSettings::realtimePort() }}", wssPort: "{{ App\Models\InstanceSettings::realtimePort() }}",
wsPath: '/realtime',
forceTLS: false, forceTLS: false,
encrypted: true, encrypted: true,
enableStats: false, enableStats: false,