Bump laravel/framework from 11.11.1 to 11.31.0 (#363)

Bumps [laravel/framework](https://github.com/laravel/framework) from 11.11.1 to 11.31.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/11.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v11.11.1...v11.31.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Feature request
+    url: https://github.com/vitodeploy/vito/discussions/new?category=ideas
+    about: Share ideas for new features
+  - name: Support
+    url: https://github.com/vitodeploy/vito/discussions/new?category=q-a
+    about: Ask the community for help
+  - name: Discord
+    url: https://discord.gg/uZeeHZZnm5
+    about: Join the community

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,12 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: feature
-assignees: ''
-
----
-
-To request a feature or suggest an idea please add it to the feedback boards
-
-https://vitodeploy.featurebase.app/

README.md

@@ -34,8 +34,7 @@ ## Useful Links
 - [Documentation](https://vitodeploy.com)
 - [Install on Server](https://vitodeploy.com/introduction/installation.html#install-on-vps-recommended)
 - [Install via Docker](https://vitodeploy.com/introduction/installation.html#install-via-docker)
-- [Feedbacks](https://vitodeploy.featurebase.app)
+- [Roadmap](https://github.com/orgs/vitodeploy/projects/5)
-- [Roadmap](https://vitodeploy.featurebase.app/roadmap)
 - [Video Demo](https://youtu.be/AbmUOBDOc28)
 - [Discord](https://discord.gg/uZeeHZZnm5)
 - [Contribution](/CONTRIBUTING.md)

app/Actions/Monitoring/GetMetrics.php

@@ -102,7 +102,7 @@ private function getInterval(array $input): Expression
             )->diffInHours();
         }
 
-        if ($periodInHours <= 1) {
+        if (abs($periodInHours) <= 1) {
             return DB::raw("strftime('%Y-%m-%d %H:%M:00', created_at) as date_interval");
         }
 

app/Actions/NotificationChannels/AddChannel.php

@@ -19,6 +19,7 @@ public function add(User $user, array $input): void
             'user_id' => $user->id,
             'provider' => $input['provider'],
             'label' => $input['label'],
+            'project_id' => isset($input['global']) && $input['global'] ? null : $user->current_project_id,
         ]);
         $this->validateType($channel, $input);
         $channel->data = $channel->provider()->createData($input);

app/Actions/NotificationChannels/EditChannel.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Actions\NotificationChannels;
+
+use App\Models\NotificationChannel;
+use App\Models\User;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
+
+class EditChannel
+{
+    public function edit(NotificationChannel $notificationChannel, User $user, array $input): void
+    {
+        $this->validate($input);
+
+        $notificationChannel->label = $input['label'];
+        $notificationChannel->project_id = isset($input['global']) && $input['global'] ? null : $user->current_project_id;
+
+        $notificationChannel->save();
+    }
+
+    /**
+     * @throws ValidationException
+     */
+    private function validate(array $input): void
+    {
+        $rules = [
+            'label' => [
+                'required',
+            ],
+        ];
+        Validator::make($input, $rules)->validate();
+    }
+}

app/Actions/PHP/GetPHPIni.php

@@ -2,8 +2,11 @@
 
 namespace App\Actions\PHP;
 
+use App\Enums\PHPIniType;
 use App\Models\Server;
 use App\SSH\Services\PHP\PHP;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
 
 class GetPHPIni
@@ -18,7 +21,7 @@ public function getIni(Server $server, array $input): string
             /** @var PHP $handler */
             $handler = $php->handler();
 
-            return $handler->getPHPIni();
+            return $handler->getPHPIni($input['type']);
         } catch (\Throwable $e) {
             throw ValidationException::withMessages(
                 ['ini' => $e->getMessage()]
@@ -28,6 +31,13 @@ public function getIni(Server $server, array $input): string
 
     public function validate(Server $server, array $input): void
     {
+        Validator::make($input, [
+            'type' => [
+                'required',
+                Rule::in([PHPIniType::CLI, PHPIniType::FPM]),
+            ],
+        ])->validate();
+
         if (! isset($input['version']) || ! in_array($input['version'], $server->installedPHPVersions())) {
             throw ValidationException::withMessages(
                 ['version' => __('This version is not installed')]

app/Actions/PHP/UpdatePHPIni.php

@@ -2,10 +2,13 @@
 
 namespace App\Actions\PHP;
 
+use App\Enums\PHPIniType;
 use App\Models\Server;
+use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
+use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
 use Throwable;
 
@@ -22,19 +25,19 @@ public function update(Server $server, array $input): void
 
         $tmpName = Str::random(10).strtotime('now');
         try {
-            /** @var \Illuminate\Filesystem\FilesystemAdapter $storageDisk */
+            /** @var FilesystemAdapter $storageDisk */
             $storageDisk = Storage::disk('local');
 
             $storageDisk->put($tmpName, $input['ini']);
             $service->server->ssh('root')->upload(
                 $storageDisk->path($tmpName),
-                "/etc/php/$service->version/cli/php.ini"
+                sprintf('/etc/php/%s/%s/php.ini', $service->version, $input['type'])
             );
             $this->deleteTempFile($tmpName);
         } catch (Throwable) {
             $this->deleteTempFile($tmpName);
             throw ValidationException::withMessages([
-                'ini' => __("Couldn't update php.ini file!"),
+                'ini' => __("Couldn't update php.ini (:type) file!", ['type' => $input['type']]),
             ]);
         }
 
@@ -56,6 +59,10 @@ public function validate(Server $server, array $input): void
                 'string',
             ],
             'version' => 'required|string',
+            'type' => [
+                'required',
+                Rule::in([PHPIniType::CLI, PHPIniType::FPM]),
+            ],
         ])->validate();
 
         if (! in_array($input['version'], $server->installedPHPVersions())) {

app/Actions/ServerProvider/CreateServerProvider.php

@@ -38,6 +38,7 @@ public function create(User $user, array $input): ServerProvider
         $serverProvider->profile = $input['name'];
         $serverProvider->provider = $input['provider'];
         $serverProvider->credentials = $provider->credentialData($input);
+        $serverProvider->project_id = isset($input['global']) && $input['global'] ? null : $user->current_project_id;
         $serverProvider->save();
 
         return $serverProvider;

app/Actions/ServerProvider/EditServerProvider.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Actions\ServerProvider;
+
+use App\Models\ServerProvider;
+use App\Models\User;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
+
+class EditServerProvider
+{
+    public function edit(ServerProvider $serverProvider, User $user, array $input): void
+    {
+        $this->validate($input);
+
+        $serverProvider->profile = $input['name'];
+        $serverProvider->project_id = isset($input['global']) && $input['global'] ? null : $user->current_project_id;
+
+        $serverProvider->save();
+    }
+
+    /**
+     * @throws ValidationException
+     */
+    private function validate(array $input): void
+    {
+        $rules = [
+            'name' => [
+                'required',
+            ],
+        ];
+        Validator::make($input, $rules)->validate();
+    }
+}

app/Actions/Site/Deploy.php

@@ -44,7 +44,12 @@ public function run(Site $site): Deployment
             $log->save();
             $deployment->log_id = $log->id;
             $deployment->save();
-            $site->server->os()->runScript($site->path, $site->deploymentScript->content, $log);
+            $site->server->os()->runScript(
+                path: $site->path,
+                script: $site->deploymentScript->content,
+                serverLog: $log,
+                variables: $site->environmentVariables($deployment)
+            );
             $deployment->status = DeploymentStatus::FINISHED;
             $deployment->save();
         })->catch(function () use ($deployment) {

app/Actions/Site/UpdateEnv.php

@@ -2,10 +2,14 @@
 
 namespace App\Actions\Site;
 
+use App\Exceptions\SSHUploadFailed;
 use App\Models\Site;
 
 class UpdateEnv
 {
+    /**
+     * @throws SSHUploadFailed
+     */
     public function update(Site $site, array $input): void
     {
         $site->server->os()->editFile(

app/Actions/SourceControl/EditSourceControl.php

@@ -14,7 +14,7 @@ public function edit(SourceControl $sourceControl, User $user, array $input): vo
         $this->validate($input);
 
         $sourceControl->profile = $input['name'];
-        $sourceControl->url = isset($input['url']) ? $input['url'] : null;
+        $sourceControl->url = $input['url'] ?? null;
         $sourceControl->project_id = isset($input['global']) && $input['global'] ? null : $user->current_project_id;
 
         $this->validateProvider($sourceControl, $input);

app/Actions/StorageProvider/CreateStorageProvider.php

@@ -21,6 +21,7 @@ public function create(User $user, array $input): void
             'user_id' => $user->id,
             'provider' => $input['provider'],
             'profile' => $input['name'],
+            'project_id' => isset($input['global']) && $input['global'] ? null : $user->current_project_id,
         ]);
 
         $this->validateProvider($input, $storageProvider->provider()->validationRules());

app/Actions/StorageProvider/EditStorageProvider.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Actions\StorageProvider;
+
+use App\Models\StorageProvider;
+use App\Models\User;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
+
+class EditStorageProvider
+{
+    public function edit(StorageProvider $storageProvider, User $user, array $input): void
+    {
+        $this->validate($input);
+
+        $storageProvider->profile = $input['name'];
+        $storageProvider->project_id = isset($input['global']) && $input['global'] ? null : $user->current_project_id;
+
+        $storageProvider->save();
+    }
+
+    /**
+     * @throws ValidationException
+     */
+    private function validate(array $input): void
+    {
+        $rules = [
+            'name' => [
+                'required',
+            ],
+        ];
+        Validator::make($input, $rules)->validate();
+    }
+}

app/Actions/Tag/AttachTag.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Actions\Tag;
+
+use App\Models\Server;
+use App\Models\Site;
+use App\Models\Tag;
+use App\Models\User;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+
+class AttachTag
+{
+    public function attach(User $user, array $input): Tag
+    {
+        $this->validate($input);
+
+        /** @var Server|Site $taggable */
+        $taggable = $input['taggable_type']::findOrFail($input['taggable_id']);
+
+        $tag = Tag::query()->where('name', $input['name'])->first();
+        if ($tag) {
+            if (! $taggable->tags->contains($tag->id)) {
+                $taggable->tags()->attach($tag->id);
+            }
+
+            return $tag;
+        }
+
+        $tag = new Tag([
+            'project_id' => $user->currentProject->id,
+            'name' => $input['name'],
+            'color' => config('core.tag_colors')[array_rand(config('core.tag_colors'))],
+        ]);
+        $tag->save();
+
+        $taggable->tags()->attach($tag->id);
+
+        return $tag;
+    }
+
+    private function validate(array $input): void
+    {
+        Validator::make($input, [
+            'name' => [
+                'required',
+            ],
+            'taggable_id' => [
+                'required',
+                'integer',
+            ],
+            'taggable_type' => [
+                'required',
+                Rule::in(config('core.taggable_types')),
+            ],
+        ])->validate();
+    }
+}

app/Actions/Tag/CreateTag.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Actions\Tag;
+
+use App\Models\Tag;
+use App\Models\User;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\ValidationException;
+
+class CreateTag
+{
+    public function create(User $user, array $input): Tag
+    {
+        $this->validate($input);
+
+        $tag = Tag::query()
+            ->where('project_id', $user->current_project_id)
+            ->where('name', $input['name'])
+            ->first();
+        if ($tag) {
+            throw ValidationException::withMessages([
+                'name' => ['Tag with this name already exists.'],
+            ]);
+        }
+
+        $tag = new Tag([
+            'project_id' => $user->currentProject->id,
+            'name' => $input['name'],
+            'color' => $input['color'],
+        ]);
+        $tag->save();
+
+        return $tag;
+    }
+
+    private function validate(array $input): void
+    {
+        Validator::make($input, [
+            'name' => [
+                'required',
+            ],
+            'color' => [
+                'required',
+                Rule::in(config('core.tag_colors')),
+            ],
+        ])->validate();
+    }
+}

app/Actions/Tag/DeleteTag.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Actions\Tag;
+
+use App\Models\Tag;
+use Illuminate\Support\Facades\DB;
+
+class DeleteTag
+{
+    public function delete(Tag $tag): void
+    {
+        DB::table('taggables')->where('tag_id', $tag->id)->delete();
+        $tag->delete();
+    }
+}

app/Actions/Tag/DetachTag.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Actions\Tag;
+
+use App\Models\Server;
+use App\Models\Site;
+use App\Models\Tag;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+
+class DetachTag
+{
+    public function detach(Tag $tag, array $input): void
+    {
+        $this->validate($input);
+
+        /** @var Server|Site $taggable */
+        $taggable = $input['taggable_type']::findOrFail($input['taggable_id']);
+
+        $taggable->tags()->detach($tag->id);
+    }
+
+    private function validate(array $input): void
+    {
+        Validator::make($input, [
+            'taggable_id' => [
+                'required',
+                'integer',
+            ],
+            'taggable_type' => [
+                'required',
+                Rule::in(config('core.taggable_types')),
+            ],
+        ])->validate();
+    }
+}

app/Actions/Tag/EditTag.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Actions\Tag;
+
+use App\Models\Tag;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\ValidationException;
+
+class EditTag
+{
+    public function edit(Tag $tag, array $input): void
+    {
+        $this->validate($input);
+
+        $tag->name = $input['name'];
+        $tag->color = $input['color'];
+
+        $tag->save();
+    }
+
+    /**
+     * @throws ValidationException
+     */
+    private function validate(array $input): void
+    {
+        $rules = [
+            'name' => [
+                'required',
+            ],
+            'color' => [
+                'required',
+                Rule::in(config('core.tag_colors')),
+            ],
+        ];
+        Validator::make($input, $rules)->validate();
+    }
+}

app/Enums/PHPIniType.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Enums;
+
+final class PHPIniType
+{
+    const CLI = 'cli';
+
+    const FPM = 'fpm';
+}

app/Enums/StorageProvider.php

@@ -9,4 +9,8 @@ final class StorageProvider
     const FTP = 'ftp';
 
     const LOCAL = 'local';
+
+    const S3 = 's3';
+
+    const WASABI = 'wasabi';
 }

app/Exceptions/DeploymentScriptIsEmptyException.php

@@ -4,6 +4,4 @@
 
 use Exception;
 
-class DeploymentScriptIsEmptyException extends Exception
+class DeploymentScriptIsEmptyException extends Exception {}
-{
-}

app/Exceptions/SSHUploadFailed.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Exceptions;
+
+class SSHUploadFailed extends SSHError
+{
+    //
+}

app/Exceptions/SourceControlIsNotConnected.php

@@ -4,6 +4,4 @@
 
 use Exception;
 
-class SourceControlIsNotConnected extends Exception
+class SourceControlIsNotConnected extends Exception {}
-{
-}

app/Facades/FTP.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Facades;
+
+use App\Support\Testing\FTPFake;
+use FTP\Connection;
+use Illuminate\Support\Facades\Facade;
+
+/**
+ * @method static bool|Connection connect(string $host, string $port, bool $ssl = false)
+ * @method static bool login(string $username, string $password, bool|Connection $connection)
+ * @method static void close(bool|Connection $connection)
+ * @method static bool passive(bool|Connection $connection, bool $passive)
+ * @method static bool delete(bool|Connection $connection, string $path)
+ * @method static void assertConnected(string $host)
+ */
+class FTP extends Facade
+{
+    protected static function getFacadeAccessor(): string
+    {
+        return 'ftp';
+    }
+
+    public static function fake(): FTPFake
+    {
+        static::swap($fake = new FTPFake());
+
+        return $fake;
+    }
+}

app/Facades/SSH.php

@@ -16,6 +16,8 @@
  * @method static string exec(string $command, string $log = '', int $siteId = null, ?bool $stream = false)
  * @method static string assertExecuted(array|string $commands)
  * @method static string assertExecutedContains(string $command)
+ * @method static string assertFileUploaded(string $toPath, ?string $content = null)
+ * @method static string getUploadedLocalPath()
  * @method static disconnect()
  */
 class SSH extends FacadeAlias

app/Helpers/FTP.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Helpers;
+
+use FTP\Connection;
+
+class FTP
+{
+    public function connect(string $host, string $port, bool $ssl = false): bool|Connection
+    {
+        if ($ssl) {
+            return ftp_ssl_connect($host, $port, 5);
+        }
+
+        return ftp_connect($host, $port, 5);
+    }
+
+    public function login(string $username, string $password, bool|Connection $connection): bool
+    {
+        return ftp_login($connection, $username, $password);
+    }
+
+    public function close(bool|Connection $connection): void
+    {
+        ftp_close($connection);
+    }
+
+    public function passive(bool|Connection $connection, bool $passive): bool
+    {
+        return ftp_pasv($connection, $passive);
+    }
+
+    public function delete(bool|Connection $connection, string $path): bool
+    {
+        return ftp_delete($connection, $path);
+    }
+}

app/Http/Controllers/ApplicationController.php

@@ -10,6 +10,7 @@
 use App\Exceptions\RepositoryNotFound;
 use App\Exceptions\RepositoryPermissionDenied;
 use App\Exceptions\SourceControlIsNotConnected;
+use App\Exceptions\SSHUploadFailed;
 use App\Facades\Toast;
 use App\Helpers\HtmxResponse;
 use App\Models\Deployment;
@@ -81,9 +82,12 @@ public function updateEnv(Server $server, Site $site, Request $request): Redirec
     {
         $this->authorize('manage', $server);
 
+        try {
             app(UpdateEnv::class)->update($site, $request->input());
-
             Toast::success('Env updated!');
+        } catch (SSHUploadFailed) {
+            Toast::error('Failed to update .env file!');
+        }
 
         return back();
     }

app/Http/Controllers/PHPController.php

@@ -81,7 +81,7 @@ public function updateIni(Server $server, Request $request): RedirectResponse
 
         app(UpdatePHPIni::class)->update($server, $request->input());
 
-        Toast::success('PHP ini updated!');
+        Toast::success(__('PHP ini (:type) updated!', ['type' => $request->input('type')]));
 
         return back()->with([
             'ini' => $request->input('ini'),

app/Http/Controllers/SSHKeyController.php

@@ -29,7 +29,7 @@ public function store(Server $server, Request $request): HtmxResponse
     {
         $this->authorize('manage', $server);
 
-        /** @var \App\Models\SshKey $key */
+        /** @var SshKey $key */
         $key = app(CreateSshKey::class)->create(
             $request->user(),
             $request->input()

app/Http/Controllers/ServerController.php

@@ -35,7 +35,9 @@ public function create(Request $request): View
         $this->authorize('create', [Server::class, $user->currentProject]);
 
         $provider = $request->query('provider', old('provider', \App\Enums\ServerProvider::CUSTOM));
-        $serverProviders = ServerProvider::query()->where('provider', $provider)->get();
+        $serverProviders = ServerProvider::getByProjectId(auth()->user()->current_project_id)
+            ->where('provider', $provider)
+            ->get();
 
         return view('servers.create', [
             'serverProviders' => $serverProviders,

app/Http/Controllers/Settings/NotificationChannelController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Settings;
 
 use App\Actions\NotificationChannels\AddChannel;
+use App\Actions\NotificationChannels\EditChannel;
 use App\Facades\Toast;
 use App\Helpers\HtmxResponse;
 use App\Http\Controllers\Controller;
@@ -13,11 +14,17 @@
 
 class NotificationChannelController extends Controller
 {
-    public function index(): View
+    public function index(Request $request): View
     {
-        return view('settings.notification-channels.index', [
+        $data = [
-            'channels' => NotificationChannel::query()->latest()->get(),
+            'channels' => NotificationChannel::getByProjectId(auth()->user()->current_project_id)->get(),
-        ]);
+        ];
+
+        if ($request->has('edit')) {
+            $data['editChannel'] = NotificationChannel::find($request->input('edit'));
+        }
+
+        return view('settings.notification-channels.index', $data);
     }
 
     public function add(Request $request): HtmxResponse
@@ -32,6 +39,19 @@ public function add(Request $request): HtmxResponse
         return htmx()->redirect(route('settings.notification-channels'));
     }
 
+    public function update(NotificationChannel $notificationChannel, Request $request): HtmxResponse
+    {
+        app(EditChannel::class)->edit(
+            $notificationChannel,
+            $request->user(),
+            $request->input(),
+        );
+
+        Toast::success('Channel updated.');
+
+        return htmx()->redirect(route('settings.notification-channels'));
+    }
+
     public function delete(int $id): RedirectResponse
     {
         $channel = NotificationChannel::query()->findOrFail($id);

app/Http/Controllers/Settings/ProjectController.php

@@ -68,7 +68,7 @@ public function delete(Project $project): RedirectResponse
         return back();
     }
 
-    public function switch($projectId): RedirectResponse
+    public function switch(Request $request, $projectId): RedirectResponse
     {
         /** @var User $user */
         $user = auth()->user();
@@ -81,6 +81,11 @@ public function switch($projectId): RedirectResponse
         $user->current_project_id = $project->id;
         $user->save();
 
+        // check if the referer is settings/*
+        if (str_contains($request->headers->get('referer'), 'settings')) {
+            return redirect()->to($request->headers->get('referer'));
+        }
+
         return redirect()->route('servers');
     }
 }

app/Http/Controllers/Settings/ServerProviderController.php

@@ -4,6 +4,7 @@
 
 use App\Actions\ServerProvider\CreateServerProvider;
 use App\Actions\ServerProvider\DeleteServerProvider;
+use App\Actions\ServerProvider\EditServerProvider;
 use App\Facades\Toast;
 use App\Helpers\HtmxResponse;
 use App\Http\Controllers\Controller;
@@ -14,11 +15,17 @@
 
 class ServerProviderController extends Controller
 {
-    public function index(): View
+    public function index(Request $request): View
     {
-        return view('settings.server-providers.index', [
+        $data = [
-            'providers' => auth()->user()->serverProviders,
+            'providers' => ServerProvider::getByProjectId(auth()->user()->current_project_id)->get(),
-        ]);
+        ];
+
+        if ($request->has('edit')) {
+            $data['editProvider'] = ServerProvider::find($request->input('edit'));
+        }
+
+        return view('settings.server-providers.index', $data);
     }
 
     public function connect(Request $request): HtmxResponse
@@ -33,6 +40,19 @@ public function connect(Request $request): HtmxResponse
         return htmx()->redirect(route('settings.server-providers'));
     }
 
+    public function update(ServerProvider $serverProvider, Request $request): HtmxResponse
+    {
+        app(EditServerProvider::class)->edit(
+            $serverProvider,
+            $request->user(),
+            $request->input(),
+        );
+
+        Toast::success('Provider updated.');
+
+        return htmx()->redirect(route('settings.server-providers'));
+    }
+
     public function delete(ServerProvider $serverProvider): RedirectResponse
     {
         try {

app/Http/Controllers/Settings/SourceControlController.php

@@ -18,7 +18,7 @@ class SourceControlController extends Controller
     public function index(Request $request): View
     {
         $data = [
-            'sourceControls' => SourceControl::getByCurrentProject(),
+            'sourceControls' => SourceControl::getByProjectId(auth()->user()->current_project_id)->get(),
         ];
 
         if ($request->has('edit')) {

app/Http/Controllers/Settings/StorageProviderController.php

@@ -4,6 +4,7 @@
 
 use App\Actions\StorageProvider\CreateStorageProvider;
 use App\Actions\StorageProvider\DeleteStorageProvider;
+use App\Actions\StorageProvider\EditStorageProvider;
 use App\Facades\Toast;
 use App\Helpers\HtmxResponse;
 use App\Http\Controllers\Controller;
@@ -14,11 +15,17 @@
 
 class StorageProviderController extends Controller
 {
-    public function index(): View
+    public function index(Request $request): View
     {
-        return view('settings.storage-providers.index', [
+        $data = [
-            'providers' => auth()->user()->storageProviders,
+            'providers' => StorageProvider::getByProjectId(auth()->user()->current_project_id)->get(),
-        ]);
+        ];
+
+        if ($request->has('edit')) {
+            $data['editProvider'] = StorageProvider::find($request->input('edit'));
+        }
+
+        return view('settings.storage-providers.index', $data);
     }
 
     public function connect(Request $request): HtmxResponse
@@ -33,6 +40,19 @@ public function connect(Request $request): HtmxResponse
         return htmx()->redirect(route('settings.storage-providers'));
     }
 
+    public function update(StorageProvider $storageProvider, Request $request): HtmxResponse
+    {
+        app(EditStorageProvider::class)->edit(
+            $storageProvider,
+            $request->user(),
+            $request->input(),
+        );
+
+        Toast::success('Provider updated.');
+
+        return htmx()->redirect(route('settings.storage-providers'));
+    }
+
     public function delete(StorageProvider $storageProvider): RedirectResponse
     {
         try {

app/Http/Controllers/Settings/TagController.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Http\Controllers\Settings;
+
+use App\Actions\Tag\AttachTag;
+use App\Actions\Tag\CreateTag;
+use App\Actions\Tag\DeleteTag;
+use App\Actions\Tag\DetachTag;
+use App\Actions\Tag\EditTag;
+use App\Facades\Toast;
+use App\Helpers\HtmxResponse;
+use App\Http\Controllers\Controller;
+use App\Models\Tag;
+use App\Models\User;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+
+class TagController extends Controller
+{
+    public function index(Request $request): View
+    {
+        $data = [
+            'tags' => Tag::getByProjectId(auth()->user()->current_project_id)->get(),
+        ];
+
+        if ($request->has('edit')) {
+            $data['editTag'] = Tag::find($request->input('edit'));
+        }
+
+        return view('settings.tags.index', $data);
+    }
+
+    public function create(Request $request): HtmxResponse
+    {
+        /** @var User $user */
+        $user = $request->user();
+
+        app(CreateTag::class)->create(
+            $user,
+            $request->input(),
+        );
+
+        Toast::success('Tag created.');
+
+        return htmx()->redirect(route('settings.tags'));
+    }
+
+    public function update(Tag $tag, Request $request): HtmxResponse
+    {
+        app(EditTag::class)->edit(
+            $tag,
+            $request->input(),
+        );
+
+        Toast::success('Tag updated.');
+
+        return htmx()->redirect(route('settings.tags'));
+    }
+
+    public function attach(Request $request): RedirectResponse
+    {
+        /** @var User $user */
+        $user = $request->user();
+
+        app(AttachTag::class)->attach($user, $request->input());
+
+        return back()->with([
+            'status' => 'tag-created',
+        ]);
+    }
+
+    public function detach(Request $request, Tag $tag): RedirectResponse
+    {
+        app(DetachTag::class)->detach($tag, $request->input());
+
+        return back()->with([
+            'status' => 'tag-detached',
+        ]);
+    }
+
+    public function delete(Tag $tag): RedirectResponse
+    {
+        app(DeleteTag::class)->delete($tag);
+
+        Toast::success('Tag deleted.');
+
+        return back();
+    }
+}

app/Models/NotificationChannel.php

@@ -3,7 +3,9 @@
 namespace App\Models;
 
 use App\Notifications\NotificationInterface;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Notifications\Notifiable;
 
 /**
@@ -12,6 +14,7 @@
  * @property array data
  * @property string label
  * @property bool connected
+ * @property int $project_id
  */
 class NotificationChannel extends AbstractModel
 {
@@ -24,6 +27,7 @@ class NotificationChannel extends AbstractModel
         'data',
         'connected',
         'is_default',
+        'project_id',
     ];
 
     protected $casts = [
@@ -47,4 +51,16 @@ public static function notifyAll(NotificationInterface $notification): void
             $channel->notify($notification);
         }
     }
+
+    public function project(): BelongsTo
+    {
+        return $this->belongsTo(Project::class);
+    }
+
+    public static function getByProjectId(int $projectId): Builder
+    {
+        return self::query()
+            ->where('project_id', $projectId)
+            ->orWhereNull('project_id');
+    }
 }

app/Models/Project.php

@@ -65,4 +65,9 @@ public function sourceControls(): HasMany
     {
         return $this->hasMany(SourceControl::class);
     }
+
+    public function tags(): HasMany
+    {
+        return $this->hasMany(Tag::class);
+    }
 }

app/Models/Server.php

@@ -14,6 +14,7 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
@@ -214,6 +215,11 @@ public function sshKeys(): BelongsToMany
             ->withTimestamps();
     }
 
+    public function tags(): MorphToMany
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
+
     public function getSshUser(): string
     {
         if ($this->ssh_user) {

app/Models/ServerProvider.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -13,6 +14,7 @@
  * @property array $credentials
  * @property bool $connected
  * @property User $user
+ * @property ?int $project_id
  */
 class ServerProvider extends AbstractModel
 {
@@ -24,12 +26,14 @@ class ServerProvider extends AbstractModel
         'provider',
         'credentials',
         'connected',
+        'project_id',
     ];
 
     protected $casts = [
         'user_id' => 'integer',
         'credentials' => 'encrypted:array',
         'connected' => 'boolean',
+        'project_id' => 'integer',
     ];
 
     public function user(): BelongsTo
@@ -46,4 +50,16 @@ public function servers(): HasMany
     {
         return $this->hasMany(Server::class, 'provider_id');
     }
+
+    public function project(): BelongsTo
+    {
+        return $this->belongsTo(Project::class);
+    }
+
+    public static function getByProjectId(int $projectId): Builder
+    {
+        return self::query()
+            ->where('project_id', $projectId)
+            ->orWhereNull('project_id');
+    }
 }

app/Models/Site.php

@@ -11,6 +11,7 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Support\Str;
 
 /**
@@ -126,6 +127,11 @@ public function ssls(): HasMany
         return $this->hasMany(Ssl::class);
     }
 
+    public function tags(): MorphToMany
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
+
     /**
      * @throws SourceControlIsNotConnected
      */
@@ -283,4 +289,17 @@ public function hasSSL(): bool
     {
         return $this->ssls->isNotEmpty();
     }
+
+    public function environmentVariables(?Deployment $deployment = null): array
+    {
+        return [
+            'SITE_PATH' => $this->path,
+            'DOMAIN' => $this->domain,
+            'BRANCH' => $this->branch ?? '',
+            'REPOSITORY' => $this->repository ?? '',
+            'COMMIT_ID' => $deployment?->commit_id ?? '',
+            'PHP_VERSION' => $this->php_version,
+            'PHP_PATH' => '/usr/bin/php'.$this->php_version,
+        ];
+    }
 }

app/Models/SourceControl.php

@@ -3,7 +3,7 @@
 namespace App\Models;
 
 use App\SourceControlProviders\SourceControlProvider;
-use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -57,10 +57,10 @@ public function project(): BelongsTo
         return $this->belongsTo(Project::class);
     }
 
-    public static function getByCurrentProject(): Collection
+    public static function getByProjectId(int $projectId): Builder
     {
         return self::query()
-            ->where('project_id', auth()->user()->current_project_id)
+            ->where('project_id', $projectId)
-            ->orWhereNull('project_id')->get();
+            ->orWhereNull('project_id');
     }
 }

app/Models/StorageProvider.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -12,6 +13,7 @@
  * @property string $provider
  * @property array $credentials
  * @property User $user
+ * @property int $project_id
  */
 class StorageProvider extends AbstractModel
 {
@@ -22,11 +24,13 @@ class StorageProvider extends AbstractModel
         'profile',
         'provider',
         'credentials',
+        'project_id',
     ];
 
     protected $casts = [
         'user_id' => 'integer',
         'credentials' => 'encrypted:array',
+        'project_id' => 'integer',
     ];
 
     public function user(): BelongsTo
@@ -45,4 +49,16 @@ public function backups(): HasMany
     {
         return $this->hasMany(Backup::class, 'storage_id');
     }
+
+    public function project(): BelongsTo
+    {
+        return $this->belongsTo(Project::class);
+    }
+
+    public static function getByProjectId(int $projectId): Builder
+    {
+        return self::query()
+            ->where('project_id', $projectId)
+            ->orWhereNull('project_id');
+    }
 }

app/Models/Tag.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Models;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphToMany;
+
+/**
+ * @property int $id
+ * @property int $project_id
+ * @property string $name
+ * @property string $color
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ */
+class Tag extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'project_id',
+        'name',
+        'color',
+    ];
+
+    protected $casts = [
+        'project_id' => 'int',
+    ];
+
+    public function project(): BelongsTo
+    {
+        return $this->belongsTo(Project::class);
+    }
+
+    public function servers(): MorphToMany
+    {
+        return $this->morphedByMany(Server::class, 'taggable');
+    }
+
+    public function sites(): MorphToMany
+    {
+        return $this->morphedByMany(Site::class, 'taggable');
+    }
+
+    public static function getByProjectId(int $projectId): Builder
+    {
+        return self::query()
+            ->where('project_id', $projectId)
+            ->orWhereNull('project_id');
+    }
+}

app/Models/User.php

@@ -106,24 +106,6 @@ public function storageProvider(string $provider): HasOne
         return $this->hasOne(StorageProvider::class)->where('provider', $provider);
     }
 
-    public function connectedStorageProviders(): HasMany
-    {
-        return $this->storageProviders()->where('connected', true);
-    }
-
-    public function connectedSourceControls(): array
-    {
-        $connectedSourceControls = [];
-        $sourceControls = $this->sourceControls()
-            ->where('connected', 1)
-            ->get(['provider']);
-        foreach ($sourceControls as $sourceControl) {
-            $connectedSourceControls[] = $sourceControl->provider;
-        }
-
-        return $connectedSourceControls;
-    }
-
     public function projects(): BelongsToMany
     {
         return $this->belongsToMany(Project::class, 'user_project')->withTimestamps();
@@ -134,11 +116,6 @@ public function currentProject(): HasOne
         return $this->HasOne(Project::class, 'id', 'current_project_id');
     }
 
-    public function isMemberOfProject(Project $project): bool
-    {
-        return $project->user_id === $this->id;
-    }
-
     public function createDefaultProject(): Project
     {
         $project = $this->projects()->first();

app/NotificationChannels/AbstractNotificationChannel.php

@@ -7,7 +7,5 @@
 
 abstract class AbstractNotificationChannel implements NotificationChannelInterface
 {
-    public function __construct(protected NotificationChannel $notificationChannel)
+    public function __construct(protected NotificationChannel $notificationChannel) {}
-    {
-    }
 }

app/NotificationChannels/Discord.php

@@ -56,7 +56,7 @@ private function checkConnection(string $subject, string $text): bool
             'content' => '*'.$subject.'*'."\n".$text,
         ]);
 
-        return $connect->ok();
+        return $connect->successful();
     }
 
     public function send(object $notifiable, NotificationInterface $notification): void

app/Notifications/SiteInstallationFailed.php

@@ -7,9 +7,7 @@
 
 class SiteInstallationFailed extends AbstractNotification
 {
-    public function __construct(protected Site $site)
+    public function __construct(protected Site $site) {}
-    {
-    }
 
     public function rawText(): string
     {

app/Notifications/SiteInstallationSucceed.php

@@ -7,9 +7,7 @@
 
 class SiteInstallationSucceed extends AbstractNotification
 {
-    public function __construct(protected Site $site)
+    public function __construct(protected Site $site) {}
-    {
-    }
 
     public function rawText(): string
     {

app/Notifications/SourceControlDisconnected.php

@@ -7,9 +7,7 @@
 
 class SourceControlDisconnected extends AbstractNotification
 {
-    public function __construct(protected SourceControl $sourceControl)
+    public function __construct(protected SourceControl $sourceControl) {}
-    {
-    }
 
     public function rawText(): string
     {

app/Providers/AppServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\Helpers\FTP;
 use App\Helpers\Notifier;
 use App\Helpers\SSH;
 use App\Helpers\Toast;
@@ -36,5 +37,8 @@ public function boot(): void
         $this->app->bind('toast', function () {
             return new Toast;
         });
+        $this->app->bind('ftp', function () {
+            return new FTP;
+        });
     }
 }

app/SSH/Cron/Cron.php

@@ -6,9 +6,7 @@
 
 class Cron
 {
-    public function __construct(protected Server $server)
+    public function __construct(protected Server $server) {}
-    {
-    }
 
     public function update(string $user, string $cron): void
     {

app/SSH/HasS3Storage.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\SSH;
+
+trait HasS3Storage
+{
+    private function prepareS3Path(string $path, string $prefix = ''): string
+    {
+        $path = trim($path);
+        $path = ltrim($path, '/');
+        $path = preg_replace('/[^a-zA-Z0-9\-_\.\/]/', '_', $path);
+        $path = preg_replace('/\/+/', '/', $path);
+
+        if ($prefix) {
+            $path = trim($prefix, '/').'/'.$path;
+        }
+
+        return $path;
+    }
+}

app/SSH/OS/OS.php

@@ -2,17 +2,20 @@
 
 namespace App\SSH\OS;
 
+use App\Exceptions\SSHUploadFailed;
 use App\Models\Server;
 use App\Models\ServerLog;
 use App\SSH\HasScripts;
+use Illuminate\Filesystem\FilesystemAdapter;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use Throwable;
 
 class OS
 {
     use HasScripts;
 
-    public function __construct(protected Server $server)
+    public function __construct(protected Server $server) {}
-    {
-    }
 
     public function installDependencies(): void
     {
@@ -111,14 +114,25 @@ public function reboot(): void
         );
     }
 
+    /**
+     * @throws SSHUploadFailed
+     */
     public function editFile(string $path, ?string $content = null): void
     {
-        $this->server->ssh()->exec(
+        $tmpName = Str::random(10).strtotime('now');
-            $this->getScript('edit-file.sh', [
+        try {
-                'path' => $path,
+            /** @var FilesystemAdapter $storageDisk */
-                'content' => $content ?? '',
+            $storageDisk = Storage::disk('local');
-            ]),
+            $storageDisk->put($tmpName, $content);
+            $this->server->ssh()->upload(
+                $storageDisk->path($tmpName),
+                $path
             );
+        } catch (Throwable) {
+            throw new SSHUploadFailed();
+        } finally {
+            $this->deleteTempFile($tmpName);
+        }
     }
 
     public function readFile(string $path): string
@@ -140,19 +154,23 @@ public function tail(string $path, int $lines): string
         );
     }
 
-    public function runScript(string $path, string $script, ?ServerLog $serverLog, ?string $user = null): ServerLog
+    public function runScript(string $path, string $script, ?ServerLog $serverLog, ?string $user = null, ?array $variables = []): ServerLog
     {
         $ssh = $this->server->ssh($user);
         if ($serverLog) {
             $ssh->setLog($serverLog);
         }
-        $ssh->exec(
+        $command = '';
-            $this->getScript('run-script.sh', [
+        foreach ($variables as $key => $variable) {
+            $command .= "$key=$variable".PHP_EOL;
+        }
+        $command .= $this->getScript('run-script.sh', [
             'path' => $path,
             'script' => $script,
-            ]),
+        ]);
-            'run-script'
+        $ssh->exec($command, 'run-script');
-        );
+
+        info($command);
 
         return $ssh->log;
     }
@@ -198,4 +216,11 @@ public function resourceInfo(): array
             'disk_free' => str($info)->after('disk_free:')->before(PHP_EOL)->toString(),
         ];
     }
+
+    private function deleteTempFile(string $name): void
+    {
+        if (Storage::disk('local')->exists($name)) {
+            Storage::disk('local')->delete($name);
+        }
+    }
 }

app/SSH/OS/scripts/edit-file.sh

@@ -1,3 +0,0 @@
-if ! echo "__content__" | tee __path__; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi

app/SSH/OS/scripts/install-dependencies.sh

@@ -1,8 +1,8 @@
-sudo DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common curl zip unzip git gcc openssl
+sudo DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common curl zip unzip git gcc openssl ufw
 git config --global user.email "__email__"
 git config --global user.name "__name__"
 
 # Install Node.js
-curl -fsSL https://deb.nodesource.com/setup_lts.x | sudo -E bash -;
+curl -fsSL https://deb.nodesource.com/setup_lts.x | sudo -E bash -
 sudo DEBIAN_FRONTEND=noninteractive apt-get update
 sudo DEBIAN_FRONTEND=noninteractive apt-get install nodejs -y

app/SSH/Services/AbstractService.php

@@ -6,9 +6,7 @@
 
 abstract class AbstractService implements ServiceInterface
 {
-    public function __construct(protected Service $service)
+    public function __construct(protected Service $service) {}
-    {
-    }
 
     public function creationRules(array $input): array
     {

app/SSH/Services/Database/AbstractDatabase.php

@@ -117,6 +117,7 @@ public function deleteUser(string $username, string $host): void
     public function link(string $username, string $host, array $databases): void
     {
         $ssh = $this->service->server->ssh();
+        $version = $this->service->version;
 
         foreach ($databases as $database) {
             $ssh->exec(
@@ -124,6 +125,7 @@ public function link(string $username, string $host, array $databases): void
                     'username' => $username,
                     'host' => $host,
                     'database' => $database,
+                    'version' => $version,
                 ]),
                 'link-user-to-database'
             );
@@ -132,10 +134,13 @@ public function link(string $username, string $host, array $databases): void
 
     public function unlink(string $username, string $host): void
     {
+        $version = $this->service->version;
+
         $this->service->server->ssh()->exec(
             $this->getScript($this->getScriptsDir().'/unlink.sh', [
                 'username' => $username,
                 'host' => $host,
+                'version' => $version,
             ]),
             'unlink-user-from-databases'
         );

app/SSH/Services/Database/scripts/mariadb/install-10.11.sh

@@ -0,0 +1,14 @@
+wget https://downloads.mariadb.com/MariaDB/mariadb_repo_setup
+
+chmod +x mariadb_repo_setup
+
+sudo DEBIAN_FRONTEND=noninteractive ./mariadb_repo_setup \
+   --mariadb-server-version="mariadb-10.11"
+
+sudo DEBIAN_FRONTEND=noninteractive apt-get update
+
+sudo DEBIAN_FRONTEND=noninteractive apt-get install mariadb-server mariadb-backup -y
+
+sudo systemctl unmask mysql.service
+
+sudo service mysql start

app/SSH/Services/Database/scripts/mariadb/install-10.6.sh

@@ -0,0 +1,14 @@
+wget https://downloads.mariadb.com/MariaDB/mariadb_repo_setup
+
+chmod +x mariadb_repo_setup
+
+sudo DEBIAN_FRONTEND=noninteractive ./mariadb_repo_setup \
+   --mariadb-server-version="mariadb-10.6"
+
+sudo DEBIAN_FRONTEND=noninteractive apt-get update
+
+sudo DEBIAN_FRONTEND=noninteractive apt-get install mariadb-server mariadb-backup -y
+
+sudo systemctl unmask mysql.service
+
+sudo service mysql start

app/SSH/Services/Database/scripts/mariadb/install-11.4.sh

@@ -0,0 +1,14 @@
+wget https://downloads.mariadb.com/MariaDB/mariadb_repo_setup
+
+chmod +x mariadb_repo_setup
+
+sudo DEBIAN_FRONTEND=noninteractive ./mariadb_repo_setup \
+   --mariadb-server-version="mariadb-11.4"
+
+sudo DEBIAN_FRONTEND=noninteractive apt-get update
+
+sudo DEBIAN_FRONTEND=noninteractive apt-get install mariadb-server mariadb-backup -y
+
+sudo systemctl unmask mysql.service
+
+sudo service mysql start

app/SSH/Services/Database/scripts/postgresql/link.sh

@@ -1,5 +1,16 @@
-if ! sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE __database__ TO __username__;"; then
+USER_TO_LINK='__username__'
+DB_NAME='__database__'
+DB_VERSION='__version__'
+
+if ! sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE \"$DB_NAME\" TO $USER_TO_LINK;"; then
     echo 'VITO_SSH_ERROR' && exit 1
 fi
 
-echo "Linking to __database__ finished"
+# Check if PostgreSQL version is 15 or greater
+if [ "$DB_VERSION" -ge 15 ]; then
+    if ! sudo -u postgres psql -d "$DB_NAME" -c "GRANT USAGE, CREATE ON SCHEMA public TO $USER_TO_LINK;"; then
+        echo 'VITO_SSH_ERROR' && exit 1
+    fi
+fi
+
+echo "Linking to $DB_NAME finished"

app/SSH/Services/Database/scripts/postgresql/unlink.sh

@@ -1,10 +1,16 @@
 USER_TO_REVOKE='__username__'
+DB_VERSION='__version__'
 
 DATABASES=$(sudo -u postgres psql -t -c "SELECT datname FROM pg_database WHERE datistemplate = false;")
 
 for DB in $DATABASES; do
     echo "Revoking privileges in database: $DB"
     sudo -u postgres psql -d "$DB" -c "REVOKE ALL PRIVILEGES ON DATABASE \"$DB\" FROM $USER_TO_REVOKE;"
+
+    # Check if PostgreSQL version is 15 or greater
+    if [ "$DB_VERSION" -ge 15 ]; then
+        sudo -u postgres psql -d "$DB" -c "REVOKE USAGE, CREATE ON SCHEMA public FROM $USER_TO_REVOKE;"
+    fi
 done
 
 echo "Privileges revoked from $USER_TO_REVOKE"

app/SSH/Services/Firewall/AbstractFirewall.php

@@ -4,6 +4,4 @@
 
 use App\SSH\Services\AbstractService;
 
-abstract class AbstractFirewall extends AbstractService implements Firewall
+abstract class AbstractFirewall extends AbstractService implements Firewall {}
-{
-}

app/SSH/Services/PHP/PHP.php

@@ -102,12 +102,10 @@ public function installComposer(): void
         );
     }
 
-    public function getPHPIni(): string
+    public function getPHPIni(string $type): string
     {
-        return $this->service->server->ssh()->exec(
+        return $this->service->server->os()->readFile(
-            $this->getScript('get-php-ini.sh', [
+            sprintf('/etc/php/%s/%s/php.ini', $this->service->version, $type)
-                'version' => $this->service->version,
-            ])
         );
     }
 }

app/SSH/Services/PHP/scripts/get-php-ini.sh

@@ -1,3 +0,0 @@
-if ! cat /etc/php/__version__/cli/php.ini; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi

app/SSH/Services/Webserver/AbstractWebserver.php

@@ -4,6 +4,4 @@
 
 use App\SSH\Services\AbstractService;
 
-abstract class AbstractWebserver extends AbstractService implements Webserver
+abstract class AbstractWebserver extends AbstractService implements Webserver {}
-{
-}

app/SSH/Services/Webserver/scripts/nginx/php-vhost-ssl.conf

@@ -27,6 +27,7 @@ server {
         fastcgi_pass unix:/var/run/php/php__php_version__-fpm.sock;
         fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
         include fastcgi_params;
+        fastcgi_hide_header X-Powered-By;
     }
 
     location ~ /\.(?!well-known).* {

app/SSH/Services/Webserver/scripts/nginx/php-vhost.conf

@@ -23,6 +23,7 @@ server {
         fastcgi_pass unix:/var/run/php/php__php_version__-fpm.sock;
         fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
         include fastcgi_params;
+        fastcgi_hide_header X-Powered-By;
     }
 
     location ~ /\.(?!well-known).* {

app/SSH/Storage/AbstractStorage.php

@@ -7,7 +7,5 @@
 
 abstract class AbstractStorage implements Storage
 {
-    public function __construct(protected Server $server, protected StorageProvider $storageProvider)
+    public function __construct(protected Server $server, protected StorageProvider $storageProvider) {}
-    {
-    }
 }

app/SSH/Storage/S3.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace App\SSH\Storage;
+
+use App\Exceptions\SSHCommandError;
+use App\Models\Server;
+use App\Models\StorageProvider;
+use App\SSH\HasS3Storage;
+use App\SSH\HasScripts;
+use Illuminate\Support\Facades\Log;
+
+class S3 extends S3AbstractStorage
+{
+    use HasS3Storage, HasScripts;
+
+    public function __construct(Server $server, StorageProvider $storageProvider)
+    {
+        parent::__construct($server, $storageProvider);
+        $this->setBucketRegion($this->storageProvider->credentials['region']);
+        $this->setApiUrl();
+    }
+
+    /**
+     * @throws SSHCommandError
+     */
+    public function upload(string $src, string $dest): array
+    {
+        $uploadCommand = $this->getScript('s3/upload.sh', [
+            'src' => $src,
+            'bucket' => $this->storageProvider->credentials['bucket'],
+            'dest' => $this->prepareS3Path($this->storageProvider->credentials['path'].'/'.$dest),
+            'key' => $this->storageProvider->credentials['key'],
+            'secret' => $this->storageProvider->credentials['secret'],
+            'region' => $this->getBucketRegion(),
+            'endpoint' => $this->getApiUrl(),
+        ]);
+
+        $upload = $this->server->ssh()->exec($uploadCommand, 'upload-to-s3');
+
+        if (str_contains($upload, 'Error') || ! str_contains($upload, 'upload:')) {
+            Log::error('Failed to upload to S3', ['output' => $upload]);
+            throw new SSHCommandError('Failed to upload to S3: '.$upload);
+        }
+
+        return [
+            'size' => null, // You can parse the size from the output if needed
+        ];
+
+    }
+
+    /**
+     * @throws SSHCommandError
+     */
+    public function download(string $src, string $dest): void
+    {
+        $downloadCommand = $this->getScript('s3/download.sh', [
+            'src' => $this->prepareS3Path($this->storageProvider->credentials['path'].'/'.$src),
+            'dest' => $dest,
+            'bucket' => $this->storageProvider->credentials['bucket'],
+            'key' => $this->storageProvider->credentials['key'],
+            'secret' => $this->storageProvider->credentials['secret'],
+            'region' => $this->getBucketRegion(),
+            'endpoint' => $this->getApiUrl(),
+        ]);
+
+        $download = $this->server->ssh()->exec($downloadCommand, 'download-from-s3');
+
+        if (! str_contains($download, 'Download successful')) {
+            Log::error('Failed to download from S3', ['output' => $download]);
+            throw new SSHCommandError('Failed to download from S3: '.$download);
+        }
+    }
+
+    /**
+     * @TODO Implement delete method
+     */
+    public function delete(string $path): void {}
+}

app/SSH/Storage/S3AbstractStorage.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\SSH\Storage;
+
+abstract class S3AbstractStorage extends AbstractStorage
+{
+    protected ?string $apiUrl = null;
+
+    protected ?string $bucketRegion = null;
+
+    public function getApiUrl(): string
+    {
+        return $this->apiUrl;
+    }
+
+    public function setApiUrl(?string $region = null): void
+    {
+        $this->bucketRegion = $region ?? $this->bucketRegion;
+        $this->apiUrl = "https://s3.{$this->bucketRegion}.amazonaws.com";
+    }
+
+    // Getter and Setter for $bucketRegion
+    public function getBucketRegion(): string
+    {
+        return $this->bucketRegion;
+    }
+
+    public function setBucketRegion(string $region): void
+    {
+        $this->bucketRegion = $region;
+    }
+}

app/SSH/Storage/Wasabi.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\SSH\Storage;
+
+use App\Exceptions\SSHCommandError;
+use App\Models\Server;
+use App\Models\StorageProvider;
+use App\SSH\HasS3Storage;
+use App\SSH\HasScripts;
+use Illuminate\Support\Facades\Log;
+
+class Wasabi extends S3AbstractStorage
+{
+    use HasS3Storage, HasScripts;
+
+    public function __construct(Server $server, StorageProvider $storageProvider)
+    {
+        parent::__construct($server, $storageProvider);
+        $this->setBucketRegion($this->storageProvider->credentials['region']);
+        $this->setApiUrl();
+    }
+
+    /**
+     * @throws SSHCommandError
+     */
+    public function upload(string $src, string $dest): array
+    {
+        $uploadCommand = $this->getScript('wasabi/upload.sh', [
+            'src' => $src,
+            'bucket' => $this->storageProvider->credentials['bucket'],
+            'dest' => $this->prepareS3Path($this->storageProvider->credentials['path'].'/'.$dest),
+            'key' => $this->storageProvider->credentials['key'],
+            'secret' => $this->storageProvider->credentials['secret'],
+            'region' => $this->storageProvider->credentials['region'],
+            'endpoint' => $this->getApiUrl(),
+        ]);
+
+        $upload = $this->server->ssh()->exec($uploadCommand, 'upload-to-wasabi');
+
+        if (str_contains($upload, 'Error') || ! str_contains($upload, 'upload:')) {
+            Log::error('Failed to upload to wasabi', ['output' => $upload]);
+            throw new SSHCommandError('Failed to upload to wasabi: '.$upload);
+        }
+
+        return [
+            'size' => null, // You can parse the size from the output if needed
+        ];
+
+    }
+
+    /**
+     * @throws SSHCommandError
+     */
+    public function download(string $src, string $dest): void
+    {
+        $downloadCommand = $this->getScript('wasabi/download.sh', [
+            'src' => $this->prepareS3Path($this->storageProvider->credentials['path'].'/'.$src),
+            'dest' => $dest,
+            'bucket' => $this->storageProvider->credentials['bucket'],
+            'key' => $this->storageProvider->credentials['key'],
+            'secret' => $this->storageProvider->credentials['secret'],
+            'region' => $this->storageProvider->credentials['region'],
+            'endpoint' => $this->getApiUrl(),
+        ]);
+
+        $download = $this->server->ssh()->exec($downloadCommand, 'download-from-wasabi');
+
+        if (! str_contains($download, 'Download successful')) {
+            Log::error('Failed to download from wasabi', ['output' => $download]);
+            throw new SSHCommandError('Failed to download from wasabi: '.$download);
+        }
+    }
+
+    /**
+     * @TODO Implement delete method
+     */
+    public function delete(string $path): void {}
+
+    public function setApiUrl(?string $region = null): void
+    {
+        $this->bucketRegion = $region ?? $this->bucketRegion;
+        $this->apiUrl = "https://{$this->storageProvider->credentials['bucket']}.s3.{$this->getBucketRegion()}.wasabisys.com";
+    }
+}

app/SSH/Storage/scripts/s3/download.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Configure AWS CLI with provided credentials
+/usr/local/bin/aws configure set aws_access_key_id "__key__"
+/usr/local/bin/aws configure set aws_secret_access_key "__secret__"
+/usr/local/bin/aws configure set default.region "__region__"
+
+# Use the provided endpoint in the correct format
+ENDPOINT="__endpoint__"
+BUCKET="__bucket__"
+REGION="__region__"
+
+# Ensure that DEST does not have a trailing slash
+SRC="__src__"
+DEST="__dest__"
+
+# Download the file from S3
+echo "Downloading s3://__bucket__/__src__ to __dest__"
+download_output=$(/usr/local/bin/aws s3 cp "s3://$BUCKET/$SRC" "$DEST" --endpoint-url="$ENDPOINT" --region "$REGION" 2>&1)
+download_exit_code=$?
+
+# Log output and exit code
+echo "Download command output: $download_output"
+echo "Download command exit code: $download_exit_code"
+
+# Check if the download was successful
+if [ $download_exit_code -eq 0 ]; then
+    echo "Download successful"
+else
+    echo "Download failed"
+    exit 1
+fi

app/SSH/Storage/scripts/s3/upload.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# Check if AWS CLI is installed
+if ! command -v aws &> /dev/null
+then
+    echo "AWS CLI is not installed. Installing..."
+
+    # Detect system architecture
+    ARCH=$(uname -m)
+    if [ "$ARCH" == "x86_64" ]; then
+        CLI_URL="https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip"
+    elif [ "$ARCH" == "aarch64" ]; then
+        CLI_URL="https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip"
+    else
+        echo "Unsupported architecture: $ARCH"
+        exit 1
+    fi
+
+    # Download and install AWS CLI
+    sudo curl "$CLI_URL" -o "awscliv2.zip"
+    sudo unzip awscliv2.zip
+    sudo ./aws/install --update
+    sudo rm -rf awscliv2.zip aws
+
+    echo "AWS CLI installation completed."
+else
+    echo "AWS CLI is already installed."
+    /usr/local/bin/aws --version
+fi
+
+# Configure AWS CLI with provided credentials
+/usr/local/bin/aws configure set aws_access_key_id "__key__"
+/usr/local/bin/aws configure set aws_secret_access_key "__secret__"
+
+# Use the provided endpoint in the correct format
+ENDPOINT="__endpoint__"
+BUCKET="__bucket__"
+REGION="__region__"
+
+# Ensure that DEST does not have a trailing slash
+SRC="__src__"
+DEST="__dest__"
+
+# Upload the file
+echo "Uploading __src__ to s3://$BUCKET/$DEST"
+upload_output=$(/usr/local/bin/aws s3 cp "$SRC" "s3://$BUCKET/$DEST" --endpoint-url="$ENDPOINT" --region "$REGION" 2>&1)
+upload_exit_code=$?
+
+# Log output and exit code
+echo "Upload command output: $upload_output"
+echo "Upload command exit code: $upload_exit_code"
+
+# Check if the upload was successful
+if [ $upload_exit_code -eq 0 ]; then
+    echo "Upload successful"
+else
+    echo "Upload failed"
+    exit 1
+fi

app/SSH/Storage/scripts/wasabi/download.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Configure AWS CLI with provided credentials
+/usr/local/bin/aws configure set aws_access_key_id "__key__"
+/usr/local/bin/aws configure set aws_secret_access_key "__secret__"
+
+# Use the provided endpoint in the correct format
+ENDPOINT="__endpoint__"
+BUCKET="__bucket__"
+REGION="__region__"
+
+# Ensure that DEST does not have a trailing slash
+SRC="__src__"
+DEST="__dest__"
+
+# Download the file from S3
+echo "Downloading s3://__bucket____src__ to __dest__"
+download_output=$(/usr/local/bin/aws s3 cp "s3://$BUCKET/$SRC" "$DEST" --endpoint-url="$ENDPOINT" --region "$REGION" 2>&1)
+download_exit_code=$?
+
+# Log output and exit code
+echo "Download command output: $download_output"
+echo "Download command exit code: $download_exit_code"
+
+# Check if the download was successful
+if [ $download_exit_code -eq 0 ]; then
+    echo "Download successful"
+else
+    echo "Download failed"
+    exit 1
+fi

app/SSH/Storage/scripts/wasabi/upload.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# Check if AWS CLI is installed
+if ! command -v aws &> /dev/null
+then
+    echo "AWS CLI is not installed. Installing..."
+
+    # Detect system architecture
+    ARCH=$(uname -m)
+    if [ "$ARCH" == "x86_64" ]; then
+        CLI_URL="https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip"
+    elif [ "$ARCH" == "aarch64" ]; then
+        CLI_URL="https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip"
+    else
+        echo "Unsupported architecture: $ARCH"
+        exit 1
+    fi
+
+    # Download and install AWS CLI
+    sudo curl "$CLI_URL" -o "awscliv2.zip"
+    sudo unzip awscliv2.zip
+    sudo ./aws/install --update
+    sudo rm -rf awscliv2.zip aws
+
+    echo "AWS CLI installation completed."
+else
+    echo "AWS CLI is already installed."
+    aws --version
+fi
+
+# Configure AWS CLI with provided credentials
+/usr/local/bin/aws configure set aws_access_key_id "__key__"
+/usr/local/bin/aws configure set aws_secret_access_key "__secret__"
+
+# Use the provided endpoint in the correct format
+ENDPOINT="__endpoint__"
+BUCKET="__bucket__"
+REGION="__region__"
+
+# Ensure that DEST does not have a trailing slash
+SRC="__src__"
+DEST="__dest__"
+
+# Upload the file
+echo "Uploading __src__ to s3://$BUCKET/$DEST"
+upload_output=$(/usr/local/bin/aws s3 cp "$SRC" "s3://$BUCKET/$DEST" --endpoint-url="$ENDPOINT" --region "$REGION" 2>&1)
+upload_exit_code=$?
+
+# Log output and exit code
+echo "Upload command output: $upload_output"
+echo "Upload command exit code: $upload_exit_code"
+
+# Check if the upload was successful
+if [ $upload_exit_code -eq 0 ]; then
+    echo "Upload successful"
+else
+    echo "Upload failed"
+    exit 1
+fi

app/SSH/Systemd/Systemd.php

@@ -6,9 +6,7 @@
 
 class Systemd
 {
-    public function __construct(protected Server $server)
+    public function __construct(protected Server $server) {}
-    {
-    }
 
     public function status(string $unit): string
     {

app/SSH/Wordpress/scripts/install.sh

@@ -24,4 +24,4 @@ if ! wp --path=__path__ core install --url='http://__domain__' --title="__title_
     echo 'VITO_SSH_ERROR' && exit 1
 fi
 
-print "Wordpress installed!"
+echo "Wordpress installed!"

app/SiteTypes/Laravel.php

@@ -2,6 +2,4 @@
 
 namespace App\SiteTypes;
 
-class Laravel extends PHPSite
+class Laravel extends PHPSite {}
-{
-}

app/StorageProviders/FTP.php

@@ -41,7 +41,7 @@ public function connect(): bool
         $isConnected = $connection && $this->login($connection);
 
         if ($isConnected) {
-            ftp_close($connection);
+            \App\Facades\FTP::close($connection);
         }
 
         return $isConnected;
@@ -58,31 +58,36 @@ public function delete(array $paths): void
 
         if ($connection && $this->login($connection)) {
             if ($this->storageProvider->credentials['passive']) {
-                ftp_pasv($connection, true);
+                \App\Facades\FTP::passive($connection, true);
             }
 
             foreach ($paths as $path) {
-                ftp_delete($connection, $this->storageProvider->credentials['path'].'/'.$path);
+                \App\Facades\FTP::delete($connection, $this->storageProvider->credentials['path'].'/'.$path);
             }
         }
 
-        ftp_close($connection);
+        \App\Facades\FTP::close($connection);
     }
 
     private function connection(): bool|Connection
     {
         $credentials = $this->storageProvider->credentials;
-        if ($credentials['ssl']) {
+
-            return ftp_ssl_connect($credentials['host'], $credentials['port'], 5);
+        return \App\Facades\FTP::connect(
+            $credentials['host'],
+            $credentials['port'],
+            $credentials['ssl']
+        );
     }
 
-        return ftp_connect($credentials['host'], $credentials['port'], 5);
+    private function login(bool|Connection $connection): bool
-    }
-
-    private function login(Connection $connection): bool
     {
         $credentials = $this->storageProvider->credentials;
 
-        return ftp_login($connection, $credentials['username'], $credentials['password']);
+        return \App\Facades\FTP::login(
+            $credentials['username'],
+            $credentials['password'],
+            $connection
+        );
     }
 }

app/StorageProviders/S3.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\StorageProviders;
+
+use App\Models\Server;
+use App\SSH\Storage\S3 as S3Storage;
+use App\SSH\Storage\Storage;
+use Aws\S3\Exception\S3Exception;
+use Illuminate\Support\Facades\Log;
+
+class S3 extends S3AbstractStorageProvider
+{
+    public function validationRules(): array
+    {
+        return [
+            'key' => 'required|string',
+            'secret' => 'required|string',
+            'region' => 'required|string',
+            'bucket' => 'required|string',
+            'path' => 'required|string',
+        ];
+    }
+
+    public function credentialData(array $input): array
+    {
+        return [
+            'key' => $input['key'],
+            'secret' => $input['secret'],
+            'region' => $input['region'],
+            'bucket' => $input['bucket'],
+            'path' => $input['path'],
+        ];
+    }
+
+    public function connect(): bool
+    {
+        try {
+            $this->setBucketRegion($this->storageProvider->credentials['region']);
+            $this->setApiUrl();
+            $this->buildClientConfig();
+            $this->getClient()->listBuckets();
+
+            return true;
+        } catch (S3Exception $e) {
+            Log::error('Failed to connect to S3', ['exception' => $e]);
+
+            return false;
+        }
+    }
+
+    public function ssh(Server $server): Storage
+    {
+        return new S3Storage($server, $this->storageProvider);
+    }
+
+    public function delete(array $paths): void {}
+}

app/StorageProviders/S3AbstractStorageProvider.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\StorageProviders;
+
+use App\Models\StorageProvider;
+use Aws\S3\S3Client;
+
+abstract class S3AbstractStorageProvider extends AbstractStorageProvider implements S3ClientInterface, S3StorageInterface
+{
+    protected ?string $apiUrl = null;
+
+    protected ?string $bucketRegion = null;
+
+    protected ?S3Client $client = null;
+
+    protected StorageProvider $storageProvider;
+
+    protected array $clientConfig = [];
+
+    public function getApiUrl(): string
+    {
+        return $this->apiUrl;
+    }
+
+    public function setApiUrl(?string $region = null): void
+    {
+        $this->bucketRegion = $region ?? $this->bucketRegion;
+        $this->apiUrl = "https://s3.{$this->bucketRegion}.amazonaws.com";
+    }
+
+    public function getBucketRegion(): string
+    {
+        return $this->bucketRegion;
+    }
+
+    public function setBucketRegion(string $region): void
+    {
+        $this->bucketRegion = $region;
+    }
+
+    public function getClient(): S3Client
+    {
+        return new S3Client($this->clientConfig);
+    }
+
+    /**
+     * Build the configuration array for the S3 client.
+     * This method can be overridden by child classes to modify the configuration.
+     */
+    public function buildClientConfig(): array
+    {
+        $this->clientConfig = [
+            'credentials' => [
+                'key' => $this->storageProvider->credentials['key'],
+                'secret' => $this->storageProvider->credentials['secret'],
+            ],
+            'region' => $this->getBucketRegion(),
+            'version' => 'latest',
+            'endpoint' => $this->getApiUrl(),
+        ];
+
+        return $this->clientConfig;
+    }
+
+    /**
+     * Set or update a configuration parameter for the S3 client.
+     */
+    public function setConfigParam(array $param): void
+    {
+        foreach ($param as $key => $value) {
+            $this->clientConfig[$key] = $value;
+        }
+    }
+}

app/StorageProviders/S3ClientInterface.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\StorageProviders;
+
+use Aws\S3\S3Client;
+
+interface S3ClientInterface
+{
+    public function getClient(): S3Client;
+}

app/StorageProviders/S3StorageInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\StorageProviders;
+
+interface S3StorageInterface
+{
+    public function getApiUrl(): string;
+
+    public function setApiUrl(?string $region = null): void;
+
+    public function getBucketRegion(): string;
+
+    public function setBucketRegion(string $region): void;
+}

app/StorageProviders/Wasabi.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\StorageProviders;
+
+use App\Models\Server;
+use App\SSH\Storage\Storage;
+use App\SSH\Storage\Wasabi as WasabiStorage;
+use Aws\S3\Exception\S3Exception;
+use Illuminate\Support\Facades\Log;
+
+class Wasabi extends S3AbstractStorageProvider
+{
+    private const DEFAULT_REGION = 'us-east-1';
+
+    public function validationRules(): array
+    {
+        return [
+            'key' => 'required|string',
+            'secret' => 'required|string',
+            'region' => 'required|string',
+            'bucket' => 'required|string',
+            'path' => 'required|string',
+        ];
+    }
+
+    public function credentialData(array $input): array
+    {
+        return [
+            'key' => $input['key'],
+            'secret' => $input['secret'],
+            'region' => $input['region'],
+            'bucket' => $input['bucket'],
+            'path' => $input['path'],
+        ];
+    }
+
+    public function connect(): bool
+    {
+        try {
+            $this->setBucketRegion(self::DEFAULT_REGION);
+            $this->setApiUrl();
+            $this->buildClientConfig();
+            $this->getClient()->listBuckets();
+
+            return true;
+        } catch (S3Exception $e) {
+            Log::error('Failed to connect to S3', ['exception' => $e]);
+
+            return false;
+        }
+    }
+
+    /**
+     * Build the configuration array for the S3 client.
+     * This method can be overridden by child classes to modify the configuration.
+     */
+    public function buildClientConfig(): array
+    {
+        $this->clientConfig = [
+            'credentials' => [
+                'key' => $this->storageProvider->credentials['key'],
+                'secret' => $this->storageProvider->credentials['secret'],
+            ],
+            'region' => $this->getBucketRegion(),
+            'version' => 'latest',
+            'endpoint' => $this->getApiUrl(),
+            'use_path_style_endpoint' => true,
+        ];
+
+        return $this->clientConfig;
+    }
+
+    public function ssh(Server $server): Storage
+    {
+        return new WasabiStorage($server, $this->storageProvider);
+    }
+
+    public function setApiUrl(?string $region = null): void
+    {
+        $this->bucketRegion = $region ?? $this->bucketRegion;
+        $this->apiUrl = "https://s3.{$this->bucketRegion}.wasabisys.com";
+    }
+
+    public function delete(array $paths): void {}
+}

app/Support/Testing/FTPFake.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Support\Testing;
+
+use FTP\Connection;
+use PHPUnit\Framework\Assert;
+
+class FTPFake
+{
+    protected array $connections = [];
+
+    protected array $logins = [];
+
+    public function connect(string $host, string $port, bool $ssl = false): bool|Connection
+    {
+        $this->connections[] = compact('host', 'port', 'ssl');
+
+        return true;
+    }
+
+    public function login(string $username, string $password, bool|Connection $connection): bool
+    {
+        $this->logins[] = compact('username', 'password');
+
+        return true;
+    }
+
+    public function close(bool|Connection $connection): void
+    {
+        //
+    }
+
+    public function passive(bool|Connection $connection, bool $passive): void
+    {
+        //
+    }
+
+    public function delete(bool|Connection $connection, string $path): void
+    {
+        //
+    }
+
+    public function assertConnected(string $host): void
+    {
+        if (! $this->connections) {
+            Assert::fail('No connections are made');
+        }
+        $connected = false;
+        foreach ($this->connections as $connection) {
+            if ($connection['host'] === $host) {
+                $connected = true;
+                break;
+            }
+        }
+        if (! $connected) {
+            Assert::fail('The expected host is not connected');
+        }
+        Assert::assertTrue(true, $connected);
+    }
+}

app/Support/Testing/SSHFake.php

@@ -17,6 +17,12 @@ class SSHFake extends SSH
 
     protected bool $connectionWillFail = false;
 
+    protected string $uploadedLocalPath;
+
+    protected string $uploadedRemotePath;
+
+    protected string $uploadedContent;
+
     public function __construct(?string $output = null)
     {
         $this->output = $output;
@@ -63,6 +69,9 @@ public function exec(string $command, string $log = '', ?int $siteId = null, ?bo
 
     public function upload(string $local, string $remote): void
     {
+        $this->uploadedLocalPath = $local;
+        $this->uploadedRemotePath = $remote;
+        $this->uploadedContent = file_get_contents($local);
         $this->log = null;
     }
 
@@ -105,4 +114,22 @@ public function assertExecutedContains(string $command): void
         }
         Assert::assertTrue(true, $executed);
     }
+
+    public function assertFileUploaded(string $toPath, ?string $content = null): void
+    {
+        if (! $this->uploadedLocalPath || ! $this->uploadedRemotePath) {
+            Assert::fail('File is not uploaded');
+        }
+
+        Assert::assertEquals($toPath, $this->uploadedRemotePath);
+
+        if ($content) {
+            Assert::assertEquals($content, $this->uploadedContent);
+        }
+    }
+
+    public function getUploadedLocalPath(): string
+    {
+        return $this->uploadedLocalPath;
+    }
 }

app/ValidationRules/CronRule.php

@@ -3,9 +3,9 @@
 namespace App\ValidationRules;
 
 use Cron\CronExpression;
-use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Contracts\Validation\ValidationRule;
 
-class CronRule implements Rule
+class CronRule implements ValidationRule
 {
     private bool $acceptCustom;
 
@@ -14,13 +14,14 @@ public function __construct(bool $acceptCustom = false)
         $this->acceptCustom = $acceptCustom;
     }
 
-    public function passes($attribute, $value): bool
+    public function validate(string $attribute, mixed $value, \Closure $fail): void
     {
-        return CronExpression::isValidExpression($value) || ($this->acceptCustom && $value === 'custom');
+        if (CronExpression::isValidExpression($value)) {
+            return;
         }
-
+        if ($this->acceptCustom && $value === 'custom') {
-    public function message(): string
+            return;
-    {
+        }
-        return __('Invalid frequency');
+        $fail('Invalid frequency')->translate();
     }
 }

app/ValidationRules/DomainRule.php

@@ -2,21 +2,19 @@
 
 namespace App\ValidationRules;
 
-use Illuminate\Contracts\Validation\Rule;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
 
-class DomainRule implements Rule
+class DomainRule implements ValidationRule
 {
-    public function passes($attribute, $value): bool
+    public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        if ($value) {
+        if (! $value) {
-            return preg_match("/^(?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63}$/", $value);
+            return;
         }
-
+        if (preg_match("/^(?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63}$/", $value) === 1) {
-        return true;
+            return;
         }
-
+        $fail('Domain is not valid')->translate();
-    public function message(): string
-    {
-        return __('Domain is not valid');
     }
 }

app/ValidationRules/RestrictedIPAddressesRule.php

@@ -2,27 +2,16 @@
 
 namespace App\ValidationRules;
 
-use Illuminate\Contracts\Validation\Rule;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
 
-class RestrictedIPAddressesRule implements Rule
+class RestrictedIPAddressesRule implements ValidationRule
 {
-    /**
+    public function validate(string $attribute, mixed $value, Closure $fail): void
-     * Determine if the validation rule passes.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
-     */
-    public function passes($attribute, $value)
     {
-        return ! in_array($value, config('core.restricted_ip_addresses'));
+        if (! in_array($value, config('core.restricted_ip_addresses'))) {
+            return;
         }
-
+        $fail('IP address is restricted')->translate();
-    /**
-     * @return array|\Illuminate\Contracts\Translation\Translator|string|null
-     */
-    public function message()
-    {
-        return __('IP address is restricted.');
     }
 }

app/ValidationRules/SshKeyRule.php

@@ -2,35 +2,21 @@
 
 namespace App\ValidationRules;
 
-use Illuminate\Contracts\Validation\Rule;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
 use phpseclib3\Crypt\PublicKeyLoader;
 use phpseclib3\Exception\NoKeyLoadedException;
 
-class SshKeyRule implements Rule
+class SshKeyRule implements ValidationRule
 {
-    /**
+    public function validate(string $attribute, mixed $value, Closure $fail): void
-     * Determine if the validation rule passes.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
-     */
-    public function passes($attribute, $value)
     {
         try {
             PublicKeyLoader::load($value);
 
-            return true;
+            return;
-        } catch (NoKeyLoadedException $e) {
+        } catch (NoKeyLoadedException) {
-            return false;
+            $fail('Invalid key')->translate();
         }
     }
-
-    /**
-     * @return array|\Illuminate\Contracts\Translation\Translator|string|null
-     */
-    public function message()
-    {
-        return __('Invalid key');
-    }
 }

app/View/Components/Editor.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\View\Components;
+
+use Closure;
+use Illuminate\Contracts\View\View;
+use Illuminate\Support\Str;
+use Illuminate\View\Component;
+
+class Editor extends Component
+{
+    public string $id;
+
+    public string $name;
+
+    public ?string $value;
+
+    public array $options;
+
+    public function __construct(
+        string $name,
+        ?string $value,
+        public string $lang,
+        public bool $readonly = false,
+        public bool $lineNumbers = true,
+    ) {
+        $this->id = $name.'-'.Str::random(8);
+        $this->name = $name;
+        $this->value = json_encode($value ?? '');
+        $this->options = $this->getOptions();
+    }
+
+    private function getOptions(): array
+    {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'lang' => $this->lang,
+            'value' => $this->value,
+        ];
+    }
+
+    public function render(): View|Closure|string
+    {
+        return view('components.editor');
+    }
+}

app/View/Components/ServerLayout.php

@@ -8,9 +8,7 @@
 
 class ServerLayout extends Component
 {
-    public function __construct(public Server $server)
+    public function __construct(public Server $server) {}
-    {
-    }
 
     public function render(): View
     {

app/View/Components/SiteLayout.php

@@ -8,9 +8,7 @@
 
 class SiteLayout extends Component
 {
-    public function __construct(public Site $site)
+    public function __construct(public Site $site) {}
-    {
-    }
 
     public function render(): View
     {

composer.json

@@ -12,7 +12,7 @@
         "ext-ftp": "*",
         "aws/aws-sdk-php": "^3.158",
         "laravel/fortify": "^1.17",
-        "laravel/framework": "^10.0",
+        "laravel/framework": "^11.0",
         "laravel/tinker": "^2.8",
         "phpseclib/phpseclib": "~3.0"
     },
@@ -21,7 +21,7 @@
         "laravel/pint": "^1.10",
         "laravel/sail": "^1.18",
         "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^7.0",
+        "nunomaduro/collision": "^8.1",
         "phpunit/phpunit": "^10.0",
         "spatie/laravel-ignition": "^2.0"
     },

config/core.php

@@ -38,6 +38,9 @@
         'mysql80',
         'mariadb103',
         'mariadb104',
+        'mariadb106',
+        'mariadb1011',
+        'mariadb114',
         'postgresql12',
         'postgresql13',
         'postgresql14',
@@ -50,6 +53,9 @@
         'mysql80' => 'mysql',
         'mariadb103' => 'mariadb',
         'mariadb104' => 'mariadb',
+        'mariadb106' => 'mariadb',
+        'mariadb1011' => 'mariadb',
+        'mariadb114' => 'mariadb',
         'postgresql12' => 'postgresql',
         'postgresql13' => 'postgresql',
         'postgresql14' => 'postgresql',
@@ -63,6 +69,9 @@
         'mariadb' => '10.3',
         'mariadb103' => '10.3',
         'mariadb104' => '10.4',
+        'mariadb106' => '10.6',
+        'mariadb1011' => '10.11',
+        'mariadb114' => '11.4',
         'postgresql12' => '12',
         'postgresql13' => '13',
         'postgresql14' => '14',
@@ -193,14 +202,23 @@
             \App\Enums\OperatingSystem::UBUNTU20 => [
                 '10.3' => 'mariadb',
                 '10.4' => 'mariadb',
+                '10.6' => 'mariadb',
+                '10.11' => 'mariadb',
+                '11.4' => 'mariadb',
             ],
             \App\Enums\OperatingSystem::UBUNTU22 => [
                 '10.3' => 'mariadb',
                 '10.4' => 'mariadb',
+                '10.6' => 'mariadb',
+                '10.11' => 'mariadb',
+                '11.4' => 'mariadb',
             ],
             \App\Enums\OperatingSystem::UBUNTU24 => [
                 '10.3' => 'mariadb',
                 '10.4' => 'mariadb',
+                '10.6' => 'mariadb',
+                '10.11' => 'mariadb',
+                '11.4' => 'mariadb',
             ],
         ],
         'postgresql' => [
@@ -409,11 +427,16 @@
         \App\Enums\StorageProvider::DROPBOX,
         \App\Enums\StorageProvider::FTP,
         \App\Enums\StorageProvider::LOCAL,
+        \App\Enums\StorageProvider::S3,
+        \App\Enums\StorageProvider::WASABI,
     ],
     'storage_providers_class' => [
         \App\Enums\StorageProvider::DROPBOX => \App\StorageProviders\Dropbox::class,
-        \App\Enums\StorageProvider::FTP => \App\StorageProviders\Ftp::class,
+        \App\Enums\StorageProvider::FTP => \App\StorageProviders\FTP::class,
         \App\Enums\StorageProvider::LOCAL => \App\StorageProviders\Local::class,
+        \App\Enums\StorageProvider::S3 => \App\StorageProviders\S3::class,
+        \App\Enums\StorageProvider::WASABI => \App\StorageProviders\Wasabi::class,
+
     ],
 
     'ssl_types' => [
@@ -427,4 +450,30 @@
         30,
         90,
     ],
+
+    'tag_colors' => [
+        'slate',
+        'gray',
+        'red',
+        'orange',
+        'amber',
+        'yellow',
+        'lime',
+        'green',
+        'emerald',
+        'teal',
+        'cyan',
+        'sky',
+        'blue',
+        'indigo',
+        'violet',
+        'purple',
+        'fuchsia',
+        'pink',
+        'rose',
+    ],
+    'taggable_types' => [
+        \App\Models\Server::class,
+        \App\Models\Site::class,
+    ],
 ];