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

fix

Browse Source
This commit is contained in:
Andras Bacsai
2023-05-15 21:48:36 +02:00
parent 6910f9c5c7
commit 114647810b
8 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Actions/Proxy/CheckProxySettingsInSync.php
View File

@@ -15,9 +15,9 @@ class CheckProxySettingsInSync
"cat $proxy_path/docker-compose.yml",
], $server, false);
if (is_null($output)) {
$final_output = Str::of(getProxyConfiguration($server))->trim();
$final_output = Str::of(getProxyConfiguration($server))->trim()->value;
} else {
$final_output = Str::of($output)->trim();
$final_output = Str::of($output)->trim()->value;
}
$docker_compose_yml_base64 = base64_encode($final_output);
$server->extra_attributes->last_saved_proxy_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;

6
app/Actions/Proxy/InstallProxy.php
View File

@@ -3,9 +3,7 @@
namespace App\Actions\Proxy;
use App\Enums\ActivityTypes;
use App\Enums\ProxyTypes;
use App\Models\Server;
use Illuminate\Support\Collection;
use Spatie\Activitylog\Models\Activity;
use Illuminate\Support\Str;
@@ -30,9 +28,9 @@ class InstallProxy
"cat $proxy_path/docker-compose.yml",
], $server, false);
if (is_null($configuration)) {
$configuration = Str::of(getProxyConfiguration($server))->trim();
$configuration = Str::of(getProxyConfiguration($server))->trim()->value;
} else {
$configuration = Str::of($configuration)->trim();
$configuration = Str::of($configuration)->trim()->value;
}
$docker_compose_yml_base64 = base64_encode($configuration);
$server->extra_attributes->last_applied_proxy_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;

2
app/Http/Livewire/Server/Proxy.php
View File

@@ -51,7 +51,7 @@ class Proxy extends Component
{
try {
$proxy_path = config('coolify.proxy_config_path');
$this->proxy_settings = Str::of($this->proxy_settings)->trim();
$this->proxy_settings = Str::of($this->proxy_settings)->trim()->value;
$docker_compose_yml_base64 = base64_encode($this->proxy_settings);
$this->server->extra_attributes->last_saved_proxy_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
$this->server->save();