revert revert so it will be good (say what?)

lucasmichot · Jan 17, 2025 · 6e9960c · 6e9960c
1 parent 78cd01d
commit 6e9960c
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 39 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         "doctrine/dbal": "^4.2",
         "guzzlehttp/guzzle": "^7.5.0",
         "laravel/fortify": "^1.16.0",
-        "laravel/framework": "11.35.0",
+        "laravel/framework": "^11.0",
         "laravel/horizon": "^5.29.1",
         "laravel/pail": "^1.1",
         "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",

diff --git a/composer.lock b/composer.lock
diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php
@@ -63,13 +63,40 @@ public function run(): void
             ]);
         }
 
+        if (! isCloud() && config('constants.coolify.is_windows_docker_desktop') == false) {
+            $coolify_key_name = '@host.docker.internal';
+            $ssh_keys_directory = Storage::disk('ssh-keys')->files();
+            $coolify_key = collect($ssh_keys_directory)->firstWhere(fn ($item) => str($item)->contains($coolify_key_name));
+
+            $private_key_found = PrivateKey::find(0);
+            if (! $private_key_found) {
+                if ($coolify_key) {
+                    $user = str($coolify_key)->before('@')->after('id.');
+                    $coolify_key = Storage::disk('ssh-keys')->get($coolify_key);
+                    PrivateKey::create([
+                        'id' => 0,
+                        'team_id' => 0,
+                        'name' => 'localhost\'s key',
+                        'description' => 'The private key for the Coolify host machine (localhost).',
+                        'private_key' => $coolify_key,
+                    ]);
+                    echo "SSH key found for the Coolify host machine (localhost).\n";
+                } else {
+                    echo "No SSH key found for the Coolify host machine (localhost).\n";
+                    echo "Please read the following documentation (point 3) to fix it: https://coolify.
+                io/docs/knowledge-base/server/openssh/\n";
+                    echo "Your localhost connection won't work until then.";
+                }
+            }
+        }
+
         if (! isCloud()) {
             if (Server::find(0) == null) {
                 $server_details = [
                     'id' => 0,
                     'name' => 'localhost',
                     'description' => "This is the server where Coolify is running on. Don't delete this!",
-                    'user' => 'root',
+                    'user' => $user,
                     'ip' => 'host.docker.internal',
                     'team_id' => 0,
                     'private_key_id' => 0,
@@ -98,35 +125,7 @@ public function run(): void
                 ]);
             }
         }
-        if (! isCloud() && config('constants.coolify.is_windows_docker_desktop') == false) {
-            $coolify_key_name = '@host.docker.internal';
-            $ssh_keys_directory = Storage::disk('ssh-keys')->files();
-            $coolify_key = collect($ssh_keys_directory)->firstWhere(fn ($item) => str($item)->contains($coolify_key_name));
 
-            $private_key_found = PrivateKey::find(0);
-            if (! $private_key_found) {
-                if ($coolify_key) {
-                    $user = str($coolify_key)->before('@')->after('id.');
-                    $coolify_key = Storage::disk('ssh-keys')->get($coolify_key);
-                    PrivateKey::create([
-                        'id' => 0,
-                        'team_id' => 0,
-                        'name' => 'localhost\'s key',
-                        'description' => 'The private key for the Coolify host machine (localhost).',
-                        'private_key' => $coolify_key,
-                    ]);
-                    $server = Server::find(0);
-                    $server->user = $user;
-                    $server->save();
-                    echo "SSH key found for the Coolify host machine (localhost).\n";
-                } else {
-                    echo "No SSH key found for the Coolify host machine (localhost).\n";
-                    echo "Please read the following documentation (point 3) to fix it: https://coolify.
-                io/docs/knowledge-base/server/openssh/\n";
-                    echo "Your localhost connection won't work until then.";
-                }
-            }
-        }
         if (config('constants.coolify.is_windows_docker_desktop')) {
             PrivateKey::updateOrCreate(
                 [