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

fix: able to change localhost's private key

Browse Source
This commit is contained in:
Andras Bacsai
2023-07-25 14:43:49 +02:00
parent 341f64839b
commit 6cd29ad7e4
9 changed files with 142 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Livewire/PrivateKey/Change.php
View File

@@ -41,7 +41,7 @@ class Change extends Component
$this->private_key->private_key .= "\n";
}
$this->private_key->save();
session('currentTeam')->privateKeys = PrivateKey::where('team_id', session('currentTeam')->id)->get();
refreshPrivateKey($this->private_key);
} catch (\Exception $e) {
return general_error_handler(err: $e, that: $this);
}

21
app/Http/Livewire/Server/Form.php
View File

@@ -49,26 +49,15 @@ class Form extends Component
public function validateServer()
{
try {
$this->uptime = instant_remote_process(['uptime'], $this->server);
if ($this->uptime) {
$this->server->settings->is_reachable = true;
$this->server->settings->save();
} else {
$this->uptime = 'Server not reachable.';
throw new \Exception('Server not reachable.');
['uptime' => $uptime, 'dockerVersion' => $dockerVersion] = validateServer($this->server);
if ($uptime) {
$this->uptime = $uptime;
}
$this->dockerVersion = instant_remote_process(['docker version|head -2|grep -i version'], $this->server, false);
if (!$this->dockerVersion) {
$this->dockerVersion = 'Not installed.';
} else {
$this->server->settings->is_usable = true;
$this->server->settings->save();
if ($dockerVersion) {
$this->dockerVersion = $dockerVersion;
$this->emit('proxyStatusUpdated');
}
} catch (\Exception $e) {
$this->server->settings->is_reachable = false;
$this->server->settings->is_usable = false;
$this->server->settings->save();
return general_error_handler(customErrorMessage: "Server is not reachable. Reason: {$e->getMessage()}", that: $this);
}
}

14
app/Http/Livewire/Server/PrivateKey.php
View File

@@ -16,16 +16,14 @@ class PrivateKey extends Component
public function checkConnection()
{
try {
$uptime = instant_remote_process(['uptime'], $this->server);
['uptime' => $uptime, 'dockerVersion' => $dockerVersion] = validateServer($this->server);
if ($uptime) {
Toaster::success('Server is reachable with this private key.');
$this->server->settings->is_reachable = true;
$this->server->settings->is_usable = true;
}
if ($dockerVersion) {
Toaster::success('Server is usable for Coolify.');
}
} catch (\Exception $e) {
$this->server->settings->is_reachable = false;
$this->server->settings->is_usable = false;
$this->server->settings->save();
return general_error_handler(customErrorMessage: "Server is not reachable. Reason: {$e->getMessage()}", that: $this);
}
}
@@ -34,9 +32,7 @@ class PrivateKey extends Component
$this->server->update([
'private_key_id' => $private_key_id
]);
// Delete the old ssh mux file to force a new one to be created
Storage::disk('ssh-mux')->delete($this->server->muxFilename());
refreshPrivateKey($this->server->privateKey);
$this->server->refresh();
$this->checkConnection();
}