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

Merge pull request #1230 from coollabsio/next

Browse Source 
4.0.0-beta.39
This commit is contained in:
Andras Bacsai 2023-09-16 16:53:17 +02:00 committed by GitHub
commit 9c5501326e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Exceptions/Handler.php
View File

@ -3,6 +3,7 @@
namespace App\Exceptions; namespace App\Exceptions;
use App\Models\InstanceSettings; use App\Models\InstanceSettings;
use App\Models\User;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Sentry\Laravel\Integration; use Sentry\Laravel\Integration;
use Sentry\State\Scope; use Sentry\State\Scope;
@ -56,8 +57,8 @@ class Handler extends ExceptionHandler
function (Scope $scope) { function (Scope $scope) {
$scope->setUser( $scope->setUser(
[ [
'id' => config('sentry.server_name'), 'email' => auth()->user()->email,
'email' => auth()->user()->email 'instanceAdmin' => User::find(0)->email
] ]
); );
} }

46
app/Http/Livewire/Boarding/Index.php
View File

@ -89,7 +89,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
if (!$this->createdServer) { if (!$this->createdServer) {
return $this->emit('error', 'Localhost server is not found. Something went wrong during installation. Please try to reinstall or contact support.'); return $this->emit('error', 'Localhost server is not found. Something went wrong during installation. Please try to reinstall or contact support.');
} }
return $this->validateServer(); return $this->validateServer('localhost');
} elseif ($type === 'remote') { } elseif ($type === 'remote') {
$this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get(); $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
if ($this->privateKeys->count() > 0) { if ($this->privateKeys->count() > 0) {
@ -185,7 +185,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
$this->validateServer(); $this->validateServer();
} }
public function validateServer() public function validateServer(?string $type = null)
{ {
try { try {
$customErrorMessage = "Server is not reachable:"; $customErrorMessage = "Server is not reachable:";
@ -197,24 +197,30 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
throw new \Exception('No Docker Engine or older than 23 version installed.'); throw new \Exception('No Docker Engine or older than 23 version installed.');
} }
$customErrorMessage = "Cannot create Server or Private Key. Please try again."; $customErrorMessage = "Cannot create Server or Private Key. Please try again.";
$createdPrivateKey = PrivateKey::create([ if ($type !== 'localhost') {
'name' => $this->privateKeyName, $createdPrivateKey = PrivateKey::create([
'description' => $this->privateKeyDescription, 'name' => $this->privateKeyName,
'private_key' => $this->privateKey, 'description' => $this->privateKeyDescription,
'team_id' => currentTeam()->id 'private_key' => $this->privateKey,
]); 'team_id' => currentTeam()->id
$server = Server::create([ ]);
'name' => $this->remoteServerName, $server = Server::create([
'ip' => $this->remoteServerHost, 'name' => $this->remoteServerName,
'port' => $this->remoteServerPort, 'ip' => $this->remoteServerHost,
'user' => $this->remoteServerUser, 'port' => $this->remoteServerPort,
'description' => $this->remoteServerDescription, 'user' => $this->remoteServerUser,
'private_key_id' => $createdPrivateKey->id, 'description' => $this->remoteServerDescription,
'team_id' => currentTeam()->id, 'private_key_id' => $createdPrivateKey->id,
]); 'team_id' => currentTeam()->id,
$server->settings->is_reachable = true; ]);
$server->settings->is_usable = true; $server->settings->is_reachable = true;
$server->settings->save(); $server->settings->is_usable = true;
$server->settings->save();
} else {
$this->createdServer->settings->update([
'is_reachable' => true,
]);
}
$this->getProxyType(); $this->getProxyType();
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this); return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);

3
config/sentry.php
View File

@ -7,8 +7,7 @@ return [
// The release version of your application // The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.38', 'release' => '4.0.0-beta.39',
'server_name' => env('APP_ID', 'coolify'),
// When left empty or `null` the Laravel environment will be used // When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'), 'environment' => config('app.env'),

2
config/version.php
View File

@ -1,3 +1,3 @@
<?php <?php
return '4.0.0-beta.38'; return '4.0.0-beta.39';

2
versions.json
View File

@ -4,7 +4,7 @@
"version": "3.12.36" "version": "3.12.36"
}, },
"v4": { "v4": {
"version": "4.0.0-beta.38" "version": "4.0.0-beta.39"
} }
} }
} }