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

temporary fix for proxy

Browse Source
This commit is contained in:
Andras Bacsai
2023-09-14 17:10:37 +02:00
parent e89868c692
commit c287276d0e
9 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Actions/Proxy/CheckConfigurationSync.php
View File

@@ -16,10 +16,7 @@ class CheckConfigurationSync
if ($reset || is_null($proxy_configuration)) {
$proxy_configuration = Str::of(generate_default_proxy_configuration($server))->trim()->value;
resolve(SaveConfigurationSync::class)($server, $proxy_configuration);
return $proxy_configuration;
}
return $proxy_configuration;
}
}

5
app/Actions/Proxy/SaveConfigurationSync.php
View File

@@ -7,11 +7,12 @@ use Illuminate\Support\Str;
class SaveConfigurationSync
{
public function __invoke(Server $server, string $configuration)
public function __invoke(Server $server)
{
try {
$proxy_settings = resolve(CheckConfigurationSync::class)($server, true);
$proxy_path = get_proxy_path();
$docker_compose_yml_base64 = base64_encode($configuration);
$docker_compose_yml_base64 = base64_encode($proxy_settings);
$server->proxy->last_saved_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
$server->save();

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

@@ -48,7 +48,7 @@ class Proxy extends Component
public function submit()
{
try {
resolve(SaveConfigurationSync::class)($this->server, $this->proxy_settings);
resolve(SaveConfigurationSync::class)($this->server);
$this->server->proxy->redirect_url = $this->redirect_url;
$this->server->save();

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

@@ -22,7 +22,7 @@ class Deploy extends Component
$this->server->proxy->last_applied_settings &&
$this->server->proxy->last_saved_settings !== $this->server->proxy->last_applied_settings
) {
resolve(SaveConfigurationSync::class)($this->server, $this->proxy_settings);
resolve(SaveConfigurationSync::class)($this->server);
}
$activity = resolve(StartProxy::class)($this->server);

16
app/Http/Livewire/Server/Proxy/Modal.php Normal file
View File

@@ -0,0 +1,16 @@
<?php
namespace App\Http\Livewire\Server\Proxy;
use App\Models\Server;
use Livewire\Component;
class Modal extends Component
{
public Server $server;
public function proxyStatusUpdated()
{
$this->emit('proxyStatusUpdated');
}
}