fix: server validation with cf tunnels
This commit is contained in:
@@ -45,6 +45,8 @@ class Form extends Component
|
|||||||
$this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage;
|
$this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage;
|
||||||
}
|
}
|
||||||
public function instantSave() {
|
public function instantSave() {
|
||||||
|
refresh_server_connection($this->server->privateKey);
|
||||||
|
$this->validateServer();
|
||||||
$this->server->settings->save();
|
$this->server->settings->save();
|
||||||
}
|
}
|
||||||
public function installDocker()
|
public function installDocker()
|
||||||
@@ -62,21 +64,19 @@ class Form extends Component
|
|||||||
$this->uptime = $uptime;
|
$this->uptime = $uptime;
|
||||||
$this->emit('success', 'Server is reachable.');
|
$this->emit('success', 'Server is reachable.');
|
||||||
} else {
|
} else {
|
||||||
ray($this->uptime);
|
|
||||||
|
|
||||||
$this->emit('error', 'Server is not reachable.');
|
$this->emit('error', 'Server is not reachable.');
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if ($dockerVersion) {
|
if ($dockerVersion) {
|
||||||
$this->dockerVersion = $dockerVersion;
|
$this->dockerVersion = $dockerVersion;
|
||||||
$this->emit('proxyStatusUpdated');
|
|
||||||
$this->emit('success', 'Docker Engine 23+ is installed!');
|
$this->emit('success', 'Docker Engine 23+ is installed!');
|
||||||
} else {
|
} else {
|
||||||
$this->emit('error', 'No Docker Engine or older than 23 version installed.');
|
$this->emit('error', 'No Docker Engine or older than 23 version installed.');
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
return handleError($e, $this, customErrorMessage: "Server is not reachable: ");
|
return handleError($e, $this, customErrorMessage: "Server is not reachable: ");
|
||||||
|
} finally {
|
||||||
|
$this->emit('proxyStatusUpdated');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,7 @@
|
|||||||
<livewire:server.proxy.modal :server="$server" />
|
<livewire:server.proxy.modal :server="$server" />
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
<h1>Server</h1>
|
<h1>Server</h1>
|
||||||
@if ($server->settings->is_reachable)
|
|
||||||
<livewire:server.proxy.status :server="$server" />
|
<livewire:server.proxy.status :server="$server" />
|
||||||
@endif
|
|
||||||
</div>
|
</div>
|
||||||
<div class="subtitle ">{{ data_get($server, 'name') }}</div>
|
<div class="subtitle ">{{ data_get($server, 'name') }}</div>
|
||||||
<nav class="navbar-main">
|
<nav class="navbar-main">
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
@if (!$server->isFunctional())
|
@if (!$server->isFunctional())
|
||||||
You can't use this server until it is validated.
|
You can't use this server until it is validated.
|
||||||
@else
|
@else
|
||||||
Server validated.
|
Server is reachable and validated.
|
||||||
@endif
|
@endif
|
||||||
<div class="flex flex-col gap-2 pt-4">
|
<div class="flex flex-col gap-2 pt-4">
|
||||||
<div class="flex flex-col w-full gap-2 lg:flex-row">
|
<div class="flex flex-col w-full gap-2 lg:flex-row">
|
||||||
|
|||||||
@@ -7,11 +7,11 @@
|
|||||||
</p>
|
</p>
|
||||||
</x-slot:modalBody>
|
</x-slot:modalBody>
|
||||||
</x-modal>
|
</x-modal>
|
||||||
@if (is_null(data_get($server, 'proxy.type')) || data_get($server, 'proxy.type') !== 'NONE')
|
@if ($server->isFunctional() && data_get($server, 'proxy.type') !== 'NONE')
|
||||||
@if (data_get($server, 'proxy.status') !== 'exited')
|
@if (data_get($server, 'proxy.status') !== 'exited')
|
||||||
<div class="flex gap-4">
|
<div class="flex gap-4">
|
||||||
<button>
|
<button>
|
||||||
<a target="_blank" href="http://{{$server->ip}}:8080">
|
<a target="_blank" href="http://{{ $server->ip }}:8080">
|
||||||
Traefik Dashboard
|
Traefik Dashboard
|
||||||
<x-external-link />
|
<x-external-link />
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
<div class="flex gap-2" x-init="$wire.getProxyStatus">
|
<div>
|
||||||
|
@if ($server->isFunctional())
|
||||||
|
<div class="flex gap-2" x-init="$wire.getProxyStatus">
|
||||||
@if ($server->proxy->status === 'running')
|
@if ($server->proxy->status === 'running')
|
||||||
<x-status.running text="Proxy Running" />
|
<x-status.running text="Proxy Running" />
|
||||||
@elseif ($server->proxy->status === 'restarting')
|
@elseif ($server->proxy->status === 'restarting')
|
||||||
@@ -16,4 +18,6 @@
|
|||||||
opacity=".5" />
|
opacity=".5" />
|
||||||
</g>
|
</g>
|
||||||
</svg></button>
|
</svg></button>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user