diff --git a/app/Actions/Proxy/CheckProxySettingsInSync.php b/app/Actions/Proxy/CheckProxySettingsInSync.php index 410ebcfba..0ffbff74b 100644 --- a/app/Actions/Proxy/CheckProxySettingsInSync.php +++ b/app/Actions/Proxy/CheckProxySettingsInSync.php @@ -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; diff --git a/app/Actions/Proxy/InstallProxy.php b/app/Actions/Proxy/InstallProxy.php index 0788fa765..090a84990 100644 --- a/app/Actions/Proxy/InstallProxy.php +++ b/app/Actions/Proxy/InstallProxy.php @@ -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; diff --git a/app/Http/Livewire/Server/Proxy.php b/app/Http/Livewire/Server/Proxy.php index 2cfae33dc..94b331495 100644 --- a/app/Http/Livewire/Server/Proxy.php +++ b/app/Http/Livewire/Server/Proxy.php @@ -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(); diff --git a/bootstrap/helpers.php b/bootstrap/helpers.php index 1040bac8c..9a304dd69 100644 --- a/bootstrap/helpers.php +++ b/bootstrap/helpers.php @@ -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()); diff --git a/resources/css/app.css b/resources/css/app.css index 4e1e62904..34b619def 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -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; } diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 26071c61a..ac0fdf495 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -1,9 +1,8 @@ @if ($servers->count() === 0)
-
Without a server, you won't be able to do much.
- @else diff --git a/resources/views/livewire/private-key/create.blade.php b/resources/views/livewire/private-key/create.blade.php index 204754062..233c24100 100644 --- a/resources/views/livewire/private-key/create.blade.php +++ b/resources/views/livewire/private-key/create.blade.php @@ -3,8 +3,8 @@ - - Save Private Key + + Save
diff --git a/resources/views/livewire/server/new/by-ip.blade.php b/resources/views/livewire/server/new/by-ip.blade.php index 72f66bc71..c3f2ddf33 100644 --- a/resources/views/livewire/server/new/by-ip.blade.php +++ b/resources/views/livewire/server/new/by-ip.blade.php @@ -16,8 +16,7 @@

Select a private key

@foreach ($private_keys as $key) -
+
{{ $key->name }}
@endforeach