diff --git a/app/Http/Livewire/Server/Form.php b/app/Http/Livewire/Server/Form.php index 18fb1dbec..d053ca4bd 100644 --- a/app/Http/Livewire/Server/Form.php +++ b/app/Http/Livewire/Server/Form.php @@ -61,7 +61,18 @@ class Form extends Component $activity = InstallDocker::run($this->server); $this->emit('newMonitorActivity', $activity->id); } - + public function checkLocalhostConnection() { + $uptime = $this->server->validateConnection(); + if ($uptime) { + $this->emit('success', 'Server is reachable.'); + $this->server->settings->is_reachable = true; + $this->server->settings->is_usable = true; + $this->server->settings->save(); + } else { + $this->emit('error', 'Server is not reachable. Please check your connection and configuration.'); + return; + } + } public function validateServer($install = true) { try { @@ -69,7 +80,7 @@ class Form extends Component if ($uptime) { $install && $this->emit('success', 'Server is reachable.'); } else { - $install &&$this->emit('error', 'Server is not reachable. Please check your connection and private key configuration.'); + $install &&$this->emit('error', 'Server is not reachable. Please check your connection and configuration.'); return; } $dockerInstalled = $this->server->validateDockerEngine(); @@ -117,6 +128,7 @@ class Form extends Component $this->emit('error', 'IP address is already in use by another team.'); return; } + refresh_server_connection($this->server->privateKey); $this->server->settings->wildcard_domain = $this->wildcard_domain; $this->server->settings->cleanup_after_percentage = $this->cleanup_after_percentage; $this->server->settings->save(); diff --git a/app/Jobs/ContainerStatusJob.php b/app/Jobs/ContainerStatusJob.php index e175aeb8f..1ed74c750 100644 --- a/app/Jobs/ContainerStatusJob.php +++ b/app/Jobs/ContainerStatusJob.php @@ -44,7 +44,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted public function handle() { try { - // ray("checking server status for {$this->server->name}"); + ray("checking server status for {$this->server->name}"); // ray()->clearAll(); $serverUptimeCheckNumber = $this->server->unreachable_count; $serverUptimeCheckNumberMax = 3; @@ -59,6 +59,9 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted $this->server->settings()->update([ 'is_reachable' => false, ]); + $this->server->update([ + 'unreachable_count' => 0, + ]); return; } $result = $this->server->validateConnection(); diff --git a/config/sentry.php b/config/sentry.php index 48463cf03..f5b1c39b0 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ return [ // The release version of your application // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) - 'release' => '4.0.0-beta.76', + 'release' => '4.0.0-beta.77', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index 5c888f006..b6e86f8a8 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ > ~/.ssh/authorized_keys EXPOSE 22 -CMD ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"] +CMD ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0", "-o", "Port=22"] diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php index 227765c4e..462d07857 100644 --- a/resources/views/livewire/server/form.blade.php +++ b/resources/views/livewire/server/form.blade.php @@ -26,16 +26,23 @@ Server is reachable and validated. @endif @if ((!$server->settings->is_reachable || !$server->settings->is_usable) && $server->id !== 0) - + Validate Server & Install Docker Engine @endif + @if ((!$server->settings->is_reachable || !$server->settings->is_usable) && $server->id === 0) + + Validate Server + + @endif
+ helper="Wildcard domain for your applications. If you set this, you will get a random generated domain for your new applications.
Example:
In case you set:https://example.com your applications will get:
https://randomId.example.com" /> {{-- --}}
@@ -59,13 +66,13 @@ helper="Disk cleanup job will be executed if disk usage is more than this number." /> @endif -

Danger Zone

-
Woah. I hope you know what are you doing.
-

Delete Server

-
This will remove this server from Coolify. Beware! There is no coming - back! -
- @if ($server->id !== 0 || isDev()) + @if ($server->id !== 0) +

Danger Zone

+
Woah. I hope you know what are you doing.
+

Delete Server

+
This will remove this server from Coolify. Beware! There is no coming + back! +
Delete diff --git a/versions.json b/versions.json index 7f8807194..73b22e7e8 100644 --- a/versions.json +++ b/versions.json @@ -4,7 +4,7 @@ "version": "3.12.36" }, "v4": { - "version": "4.0.0-beta.76" + "version": "4.0.0-beta.77" } } }