Merge branch 'next' into fix-ssh-multiplexing-docker-desktop-windows

Author: andrasbacsai

.env.development.example

@@ -6,7 +6,7 @@ APP_KEY=
 APP_URL=http://localhost
 APP_PORT=8000
 APP_DEBUG=true
-MUX_ENABLED=false
+SSH_MUX_ENABLED=false
 
 # PostgreSQL Database Configuration
 DB_DATABASE=coolify

app/Livewire/Boarding/Index.php

@@ -282,7 +282,7 @@ public function installServer()
     public function validateServer()
     {
         try {
-            config()->set('coolify.mux_enabled', false);
+            config()->set('constants.ssh.mux_enabled', false);
 
             // EC2 does not have `uptime` command, lol
             instant_remote_process(['ls /'], $this->createdServer, true);

app/Models/Server.php

@@ -967,7 +967,7 @@ public function isSwarmWorker()
 
     public function validateConnection()
     {
-        config()->set('coolify.mux_enabled', false);
+        config()->set('constants.ssh.mux_enabled', false);
 
         $server = Server::find($this->id);
         if (! $server) {

app/Models/Service.php

@@ -667,7 +667,7 @@ public function extraFields()
                     }
                     $data = $data->merge([
                         'Root User' => [
-                            'key' => 'N/A',
+                            'key' => 'GITLAB_ROOT_USER',
                             'value' => 'root',
                             'rules' => 'required',
                             'isPassword' => true,

bootstrap/helpers/proxy.php

@@ -137,6 +137,8 @@ function generate_default_proxy_configuration(Server $server)
             'external' => true,
         ];
     });
+    // TODO: This should not be null on new servers, but it is.
+    ray($proxy_type);
     if ($proxy_type === ProxyTypes::TRAEFIK->value) {
         $labels = [
             'traefik.enable=true',

bootstrap/helpers/remoteProcess.php

@@ -161,8 +161,8 @@ function generateSshCommand(Server $server, string $command)
 
     $ssh_command = "timeout $timeout ssh ";
 
-    $muxEnabled = config('coolify.mux_enabled') && config('coolify.is_windows_docker_desktop') == false;
-
+    $muxEnabled = config('constants.ssh.mux_enabled') && config('coolify.is_windows_docker_desktop') == false;
+    // ray('SSH Multiplexing Enabled:', $muxEnabled)->blue();
     if ($muxEnabled) {
         // Always use multiplexing when enabled
         $muxSocket = "/var/www/html/storage/app/ssh/mux/{$server->muxFilename()}";
@@ -212,7 +212,11 @@ function ensureMultiplexedConnection(Server $server)
     }
 
     $muxSocket = "/var/www/html/storage/app/ssh/mux/{$server->muxFilename()}";
-    $checkCommand = "ssh -O check -o ControlPath=$muxSocket {$server->user}@{$server->ip} 2>/dev/null";
+    $checkCommand = "ssh -O check -o ControlPath=$muxSocket ";
+    if (data_get($server, 'settings.is_cloudflare_tunnel')) {
+        $checkCommand .= '-o ProxyCommand="/usr/local/bin/cloudflared access ssh --hostname %h" ';
+    }
+    $checkCommand .= " {$server->user}@{$server->ip}";
 
     $process = Process::run($checkCommand);
 
@@ -233,8 +237,12 @@ function ensureMultiplexedConnection(Server $server)
     $serverInterval = config('constants.ssh.server_interval');
     $muxPersistTime = config('constants.ssh.mux_persist_time');
 
-    $establishCommand = "ssh -fNM -o ControlMaster=auto -o ControlPath=$muxSocket -o ControlPersist={$muxPersistTime} "
-        ."-i {$privateKeyLocation} "
+    $establishCommand = "ssh -fNM -o ControlMaster=auto -o ControlPath=$muxSocket -o ControlPersist={$muxPersistTime} ";
+
+    if (data_get($server, 'settings.is_cloudflare_tunnel')) {
+        $establishCommand .= '-o ProxyCommand="/usr/local/bin/cloudflared access ssh --hostname %h" ';
+    }
+    $establishCommand .= "-i {$privateKeyLocation} "
         .'-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null '
         .'-o PasswordAuthentication=no '
         ."-o ConnectTimeout=$connectionTimeout "
@@ -313,7 +321,7 @@ function instant_remote_process(Collection|array $command, Server $server, bool
     $end_time = microtime(true);
 
     $execution_time = ($end_time - $start_time) * 1000; // Convert to milliseconds
-    // ray('SSH command execution time:', $execution_time.' ms')->orange();
+    ray('SSH command execution time:', $execution_time.' ms')->orange();
 
     $output = trim($process->output());
     $exitCode = $process->exitCode();

composer.json

@@ -48,7 +48,6 @@
         "zircote/swagger-php": "^4.10"
     },
     "require-dev": {
-        "itsgoingd/clockwork": "^5.2",
         "fakerphp/faker": "^v1.21.0",
         "laravel/dusk": "^v8.0",
         "laravel/pint": "^1.16",