ershisan99/coolify
1
0
Fork 0
mirror of https://github.com/ershisan99/coolify.git synced 2025-12-16 20:49:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: proxy conf in dev

Browse Source
This commit is contained in:
Andras Bacsai
2024-10-04 13:25:05 +02:00
parent 82daf6c420
commit ce49f4806d
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Actions/Proxy/CheckConfiguration.php
View File

@@ -22,7 +22,7 @@ class CheckConfiguration
]; ];
$proxy_configuration = instant_remote_process($payload, $server, false); $proxy_configuration = instant_remote_process($payload, $server, false);
if ($reset || ! $proxy_configuration || is_null($proxy_configuration)) { if ($reset || ! $proxy_configuration || is_null($proxy_configuration)) {
$proxy_configuration = str(generate_default_proxy_configuration($server))->trim()->value; $proxy_configuration = str(generate_default_proxy_configuration($server))->trim()->value();
} }
if (! $proxy_configuration || is_null($proxy_configuration)) { if (! $proxy_configuration || is_null($proxy_configuration)) {
throw new \Exception('Could not generate proxy configuration'); throw new \Exception('Could not generate proxy configuration');

5
app/Models/Server.php
View File

@@ -448,12 +448,15 @@ $schema://$host {
// Should move everything except /caddy and /nginx to /traefik // Should move everything except /caddy and /nginx to /traefik
// The code needs to be modified as well, so maybe it does not worth it // The code needs to be modified as well, so maybe it does not worth it
if ($proxyType === ProxyTypes::TRAEFIK->value) { if ($proxyType === ProxyTypes::TRAEFIK->value) {
$proxy_path = $proxy_path; // Do nothing
} elseif ($proxyType === ProxyTypes::CADDY->value) { } elseif ($proxyType === ProxyTypes::CADDY->value) {
$proxy_path = $proxy_path.'/caddy'; $proxy_path = $proxy_path.'/caddy';
} elseif ($proxyType === ProxyTypes::NGINX->value) { } elseif ($proxyType === ProxyTypes::NGINX->value) {
$proxy_path = $proxy_path.'/nginx'; $proxy_path = $proxy_path.'/nginx';
} }
if (isDev()) {
$proxy_path = '/var/lib/docker/volumes/coolify_dev_coolify_data/_data/proxy';
}
return $proxy_path; return $proxy_path;
} }