Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: save proxy configuration

Browse Source
This commit is contained in:
Andras Bacsai 2023-09-21 11:03:52 +02:00
parent b4d69a22df
commit 301469de6b
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,9 +10,11 @@ class SaveConfiguration
{ {
use AsAction; use AsAction;
public function handle(Server $server) public function handle(Server $server, ?string $proxy_settings = null)
{ {
$proxy_settings = CheckConfiguration::run($server, true); if (is_null($proxy_settings)) {
$proxy_settings = CheckConfiguration::run($server, true);
}
$proxy_path = get_proxy_path(); $proxy_path = get_proxy_path();
$docker_compose_yml_base64 = base64_encode($proxy_settings); $docker_compose_yml_base64 = base64_encode($proxy_settings);

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

@ -47,7 +47,7 @@ public function select_proxy($proxy_type)
public function submit() public function submit()
{ {
try { try {
SaveConfiguration::run($this->server); SaveConfiguration::run($this->server, $this->proxy_settings);
$this->server->proxy->redirect_url = $this->redirect_url; $this->server->proxy->redirect_url = $this->redirect_url;
$this->server->save(); $this->server->save();

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

@ -20,13 +20,6 @@ public function proxyStatusUpdated()
public function startProxy() public function startProxy()
{ {
try { try {
if (
$this->server->proxy->last_applied_settings &&
$this->server->proxy->last_saved_settings !== $this->server->proxy->last_applied_settings
) {
SaveConfiguration::run($this->server);
}
$activity = StartProxy::run($this->server); $activity = StartProxy::run($this->server);
$this->emit('newMonitorActivity', $activity->id); $this->emit('newMonitorActivity', $activity->id);
} catch (\Throwable $e) { } catch (\Throwable $e) {