From 0b0ae55f0bbdb942abf6217884f6681cc36498b3 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 11 Oct 2023 13:47:14 +0200
Subject: [PATCH] fix

---
 app/Jobs/ContainerStatusJob.php                | 5 ++++-
 docker/testing-host/Dockerfile                 | 2 +-
 resources/views/livewire/server/form.blade.php | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

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 @@ public function uniqueId(): string
     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 @@ public function handle()
                 $this->server->settings()->update([
                     'is_reachable' => false,
                 ]);
+                $this->server->update([
+                    'unreachable_count' => 0,
+                ]);
                 return;
             }
             $result = $this->server->validateConnection();
diff --git a/docker/testing-host/Dockerfile b/docker/testing-host/Dockerfile
index d78b6f03e..6d0d0d5c5 100644
--- a/docker/testing-host/Dockerfile
+++ b/docker/testing-host/Dockerfile
@@ -27,4 +27,4 @@ RUN mkdir -p ~/.ssh
 RUN echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFuGmoeGq/pojrsyP1pszcNVuZx9iFkCELtxrh31QJ68 coolify@coolify-instance" >> ~/.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 d5382fd50..462d07857 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -31,7 +31,7 @@
                 Validate Server & Install Docker Engine
             </x-forms.button>
         @endif
-        @if ($server->id === 0)
+        @if ((!$server->settings->is_reachable || !$server->settings->is_usable) && $server->id === 0)
             <x-forms.button class="mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-100"
                 wire:click.prevent='checkLocalhostConnection' isHighlighted>
                 Validate Server
@@ -42,7 +42,7 @@
                 <x-forms.input id="server.name" label="Name" required />
                 <x-forms.input id="server.description" label="Description" />
                 <x-forms.input placeholder="https://example.com" id="wildcard_domain" label="Wildcard Domain"
-                    helper="Wildcard domain for your applications. If you set this, you will get a random generated domain for your new applications.<br><span class='font-bold text-white'>Example</span>In case you set:<span class='text-helper'>https://example.com</span>your applications will get: <span class='text-helper'>https://randomId.example.com</span>" />
+                    helper="Wildcard domain for your applications. If you set this, you will get a random generated domain for your new applications.<br><span class='font-bold text-white'>Example:</span><br>In case you set:<span class='text-helper'>https://example.com</span> your applications will get:<br> <span class='text-helper'>https://randomId.example.com</span>" />
                 {{-- <x-forms.checkbox disabled type="checkbox" id="server.settings.is_part_of_swarm"
                     label="Is it part of a Swarm cluster?" /> --}}
             </div>