diff --git a/app/Models/Server.php b/app/Models/Server.php index d13f1f468f..c2e36b1fd6 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -1136,14 +1136,7 @@ class Server extends BaseModel 0 => 'http', ], 'service' => 'coolify-reverb', - 'rule' => "Host(`{$host}`) && PathPrefix(`/app`)", - ], - 'coolify-reverb-api' => [ - 'entryPoints' => [ - 0 => 'http', - ], - 'service' => 'coolify-reverb', - 'rule' => "Host(`{$host}`) && PathPrefix(`/apps`)", + 'rule' => "Host(`{$host}`) && PathPrefix(`/app/`)", ], 'coolify-terminal-ws' => [ 'entryPoints' => [ @@ -1206,15 +1199,7 @@ class Server extends BaseModel 0 => 'https', ], 'service' => 'coolify-reverb', - 'rule' => "Host(`{$host}`) && PathPrefix(`/app`)", - 'tls' => $tls, - ]; - $traefik_dynamic_conf['http']['routers']['coolify-reverb-api-https'] = [ - 'entryPoints' => [ - 0 => 'https', - ], - 'service' => 'coolify-reverb', - 'rule' => "Host(`{$host}`) && PathPrefix(`/apps`)", + 'rule' => "Host(`{$host}`) && PathPrefix(`/app/`)", 'tls' => $tls, ]; $traefik_dynamic_conf['http']['routers']['coolify-terminal-wss'] = [ @@ -1256,9 +1241,6 @@ $siteAddress { handle /app/* { reverse_proxy coolify:6001 } - handle /apps* { - reverse_proxy coolify:6001 - } handle /terminal/ws { reverse_proxy coolify:6002 } diff --git a/tests/Feature/Proxy/TraefikCertificateResolverTest.php b/tests/Feature/Proxy/TraefikCertificateResolverTest.php index 51bbe605ca..e9de25c522 100644 --- a/tests/Feature/Proxy/TraefikCertificateResolverTest.php +++ b/tests/Feature/Proxy/TraefikCertificateResolverTest.php @@ -95,10 +95,14 @@ test('coolify dashboard routes follow the server certificate resolver', function preg_match("/echo '([A-Za-z0-9+\/=]+)' \| base64 -d/", $command, $matches); $routers = Yaml::parse(base64_decode($matches[1]))['http']['routers']; - foreach (['coolify-https', 'coolify-reverb-wss', 'coolify-reverb-api-https', 'coolify-terminal-wss'] as $router) { + foreach (['coolify-https', 'coolify-reverb-wss', 'coolify-terminal-wss'] as $router) { expect($routers[$router])->toHaveKey('tls') ->and($routers[$router]['tls'] ?? [])->toBe($expectedTls); } + + expect($routers)->not->toHaveKeys(['coolify-reverb-api', 'coolify-reverb-api-https']) + ->and($routers['coolify-reverb-ws']['rule'])->toBe('Host(`coolify.example.com`) && PathPrefix(`/app/`)') + ->and($routers['coolify-reverb-wss']['rule'])->toBe('Host(`coolify.example.com`) && PathPrefix(`/app/`)'); })->with([ 'letsencrypt' => ['letsencrypt', ['certresolver' => 'letsencrypt']], 'no resolver' => [null, []],