cupcakearmy/coolify
1
0
Fork 0
mirror of https://github.com/cupcakearmy/coolify.git synced 2024-10-22 16:14:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Andras Bacsai 2023-05-15 21:48:36 +02:00
parent 6910f9c5c7
commit 114647810b
8 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Actions/Proxy/CheckProxySettingsInSync.php
View File

@ -15,9 +15,9 @@ public function __invoke(Server $server)
"cat $proxy_path/docker-compose.yml",
], $server, false);
if (is_null($output)) {
$final_output = Str::of(getProxyConfiguration($server))->trim();
$final_output = Str::of(getProxyConfiguration($server))->trim()->value;
} else {
$final_output = Str::of($output)->trim();
$final_output = Str::of($output)->trim()->value;
}
$docker_compose_yml_base64 = base64_encode($final_output);
$server->extra_attributes->last_saved_proxy_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;

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

@ -3,9 +3,7 @@
namespace App\Actions\Proxy;
use App\Enums\ActivityTypes;
use App\Enums\ProxyTypes;
use App\Models\Server;
use Illuminate\Support\Collection;
use Spatie\Activitylog\Models\Activity;
use Illuminate\Support\Str;
@ -30,9 +28,9 @@ public function __invoke(Server $server): Activity
"cat $proxy_path/docker-compose.yml",
], $server, false);
if (is_null($configuration)) {
$configuration = Str::of(getProxyConfiguration($server))->trim();
$configuration = Str::of(getProxyConfiguration($server))->trim()->value;
} else {
$configuration = Str::of($configuration)->trim();
$configuration = Str::of($configuration)->trim()->value;
}
$docker_compose_yml_base64 = base64_encode($configuration);
$server->extra_attributes->last_applied_proxy_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;

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

@ -51,7 +51,7 @@ public function saveConfiguration()
{
try {
$proxy_path = config('coolify.proxy_config_path');
$this->proxy_settings = Str::of($this->proxy_settings)->trim();
$this->proxy_settings = Str::of($this->proxy_settings)->trim()->value;
$docker_compose_yml_base64 = base64_encode($this->proxy_settings);
$this->server->extra_attributes->last_saved_proxy_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
$this->server->save();

1
bootstrap/helpers.php
View File

@ -159,6 +159,7 @@ function instantRemoteProcess(array $command, Server $server, $throwError = true
{
$command_string = implode("\n", $command);
$private_key_location = savePrivateKeyForServer($server);
$ssh_command = generateSshCommand($private_key_location, $server->ip, $server->user, $server->port, $command_string);
$process = Process::run($ssh_command);
$output = trim($process->output());

2
resources/css/app.css
View File

@ -46,5 +46,5 @@ h3 {
@apply text-lg font-bold py-4;
}
.box {
@apply flex items-center justify-center text-sm rounded cursor-pointer h-14 bg-coolgray-200 hover:bg-coollabs p-2;
@apply flex items-center justify-center text-sm rounded cursor-pointer h-14 bg-coolgray-200 hover:bg-coollabs-100 p-2;
}

5
resources/views/dashboard.blade.php
View File

@ -1,9 +1,8 @@
<x-layout>
@if ($servers->count() === 0)
<div class="flex flex-col items-center justify-center h-full pt-32">
<div class="pb-3">Without a server, you won't be able to do much.</div>
<div class="text-2xl">Let's create <a href="{{ route('server.new') }}"
class="p-2 rounded bg-coollabs hover:bg-coollabs-100">your
<div class="">Without a server, you won't be able to do much</div>
<div class="text-2xl">Let's create <a class="underline" href="{{ route('server.new') }}">your
first</a> one!</div>
</div>
@else

4
resources/views/livewire/private-key/create.blade.php
View File

@ -3,8 +3,8 @@
<x-inputs.input id="name" label="Name" required />
<x-inputs.input id="description" label="Description" />
<x-inputs.input type="textarea" id="value" label="Private Key" required />
<x-inputs.button type="submit" wire.click.prevent>
Save Private Key
<x-inputs.button isBold type="submit" wire.click.prevent>
Save
</x-inputs.button>
</form>
</div>

3
resources/views/livewire/server/new/by-ip.blade.php
View File

@ -16,8 +16,7 @@
<h1>Select a private key</h1>
<div class="flex">
@foreach ($private_keys as $key)
<div class="w-32 box" :class="{ 'bg-coollabs': {{ $private_key_id == $key->id }} }"
wire:click.defer.prevent="setPrivateKey('{{ $key->id }}')">
<div class="w-32 box" wire:click.defer.prevent="setPrivateKey('{{ $key->id }}')">
{{ $key->name }}
</div>
@endforeach