revert migration squash (#261)

* upgrade to Laravel 11 and schema squash

* code style and npm audit fix

* fix #209

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/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/Enums/PHPIniType.php

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

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/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/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', [
-            'channels' => NotificationChannel::query()->latest()->get(),
-        ]);
+        $data = [
+            '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', [
-            'providers' => auth()->user()->serverProviders,
-        ]);
+        $data = [
+            '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', [
-            'providers' => auth()->user()->storageProviders,
-        ]);
+        $data = [
+            '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/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/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/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)
-            ->orWhereNull('project_id')->get();
+            ->where('project_id', $projectId)
+            ->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/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/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/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/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(
-            $this->getScript('edit-file.sh', [
-                'path' => $path,
-                'content' => $content ?? '',
-            ]),
+        $tmpName = Str::random(10).strtotime('now');
+        try {
+            /** @var FilesystemAdapter $storageDisk */
+            $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
@@ -202,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/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/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/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(
-            $this->getScript('get-php-ini.sh', [
-                'version' => $this->service->version,
-            ])
+        return $this->service->server->os()->readFile(
+            sprintf('/etc/php/%s/%s/php.ini', $this->service->version, $type)
         );
     }
 }

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/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/SiteTypes/Laravel.php

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

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;
         }
-
-    public function message(): string
-    {
-        return __('Invalid frequency');
+        if ($this->acceptCustom && $value === 'custom') {
+            return;
+        }
+        $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) {
-            return preg_match("/^(?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63}$/", $value);
+        if (! $value) {
+            return;
         }
-
-        return true;
+        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;
         }
-
-    public function message(): string
-    {
-        return __('Domain is not valid');
+        $fail('Domain is not valid')->translate();
     }
 }

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
 {
-    /**
-     * Determine if the validation rule passes.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
-     */
-    public function passes($attribute, $value)
+    public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        return ! in_array($value, config('core.restricted_ip_addresses'));
+        if (! in_array($value, config('core.restricted_ip_addresses'))) {
+            return;
         }
-
-    /**
-     * @return array|\Illuminate\Contracts\Translation\Translator|string|null
-     */
-    public function message()
-    {
-        return __('IP address is restricted.');
+        $fail('IP address is restricted')->translate();
     }
 }

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
 {
-    /**
-     * Determine if the validation rule passes.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @return bool
-     */
-    public function passes($attribute, $value)
+    public function validate(string $attribute, mixed $value, Closure $fail): void
     {
         try {
             PublicKeyLoader::load($value);
 
-            return true;
-        } catch (NoKeyLoadedException $e) {
-            return false;
+            return;
+        } catch (NoKeyLoadedException) {
+            $fail('Invalid key')->translate();
         }
     }
-
-    /**
-     * @return array|\Illuminate\Contracts\Translation\Translator|string|null
-     */
-    public function message()
-    {
-        return __('Invalid key');
-    }
 }

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' => [

database/migrations/2024_06_24_211155_add_project_id_to_notification_channels_table.php

@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('notification_channels', function (Blueprint $table) {
+            $table->unsignedBigInteger('project_id')->nullable();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('notification_channels', function (Blueprint $table) {
+            $table->dropColumn('project_id');
+        });
+    }
+};

database/migrations/2024_06_25_202655_add_project_id_to_storage_providers_table.php

@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('storage_providers', function (Blueprint $table) {
+            $table->unsignedBigInteger('project_id')->nullable();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('storage_providers', function (Blueprint $table) {
+            $table->dropColumn('project_id');
+        });
+    }
+};

database/migrations/2024_06_25_212812_add_project_id_to_server_providers_table.php

@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('server_providers', function (Blueprint $table) {
+            $table->unsignedBigInteger('project_id')->nullable();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('server_providers', function (Blueprint $table) {
+            $table->dropColumn('project_id');
+        });
+    }
+};

docker/start.sh

@@ -5,6 +5,39 @@ NAME=${NAME:-"vito"}
 EMAIL=${EMAIL:-"vito@vitodeploy.com"}
 PASSWORD=${PASSWORD:-"password"}
 
+# Function to check if a string is 32 characters long
+check_length() {
+    local key=$1
+    if [ ${#key} -ne 32 ]; then
+        echo "Invalid APP_KEY"
+        exit 1
+    fi
+}
+
+# Check if APP_KEY is set
+if [ -z "$APP_KEY" ]; then
+    echo "APP_KEY is not set"
+    exit 1
+fi
+
+# Check if APP_KEY starts with 'base64:'
+if [[ $APP_KEY == base64:* ]]; then
+    # Remove 'base64:' prefix and decode the base64 string
+    decoded_key=$(echo "${APP_KEY:7}" | base64 --decode 2>/dev/null)
+
+    # Check if decoding was successful
+    if [ $? -ne 0 ]; then
+        echo "Invalid APP_KEY base64 encoding"
+        exit 1
+    fi
+
+    # Check the length of the decoded key
+    check_length "$decoded_key"
+else
+    # Check the length of the raw APP_KEY
+    check_length "$APP_KEY"
+fi
+
 # check if the flag file does not exist, indicating a first run
 if [ ! -f "$INIT_FLAG" ]; then
     echo "Initializing..."

package-lock.json

@@ -4,6 +4,7 @@
     "requires": true,
     "packages": {
         "": {
+            "name": "vito",
             "devDependencies": {
                 "@tailwindcss/forms": "^0.5.2",
                 "@tailwindcss/typography": "^0.5.9",
@@ -694,12 +695,12 @@
             }
         },
         "node_modules/braces": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
             "dev": true,
             "dependencies": {
-                "fill-range": "^7.0.1"
+                "fill-range": "^7.1.1"
             },
             "engines": {
                 "node": ">=8"
@@ -969,9 +970,9 @@
             }
         },
         "node_modules/fill-range": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
             "dev": true,
             "dependencies": {
                 "to-regex-range": "^5.0.1"

resources/views/application/deployment-script.blade.php

@@ -16,7 +16,7 @@ class="p-6"
 
             <div class="mt-6">
                 <x-input-label for="script" :value="__('Script')" />
-                <x-textarea id="script" name="script" class="mt-1 min-h-[400px] w-full">
+                <x-textarea id="script" name="script" class="mt-1 min-h-[400px] w-full font-mono">
                     {{ old("script", $site->deploymentScript?->content) }}
                 </x-textarea>
                 @error("script")

resources/views/application/env.blade.php

@@ -21,7 +21,7 @@ class="mt-6"
             >
                 <x-input-label for="env" :value="__('.env')" />
                 <div id="env-content">
-                    <x-textarea id="env" name="env" rows="10" class="mt-1 block min-h-[400px] w-full">
+                    <x-textarea id="env" name="env" rows="10" class="mt-1 block min-h-[400px] w-full font-mono">
                         {{ old("env", session()->get("env") ?? "Loading...") }}
                     </x-textarea>
                 </div>

resources/views/components/console-view.blade.php

@@ -1,5 +1,5 @@
 <div
-    {{ $attributes->merge(["class" => "relative h-[500px] w-full overflow-auto whitespace-pre-line rounded-md border border-gray-200 bg-black p-5 text-gray-50 dark:border-gray-700"]) }}
+    {{ $attributes->merge(["class" => "font-mono whitespace-pre relative h-[500px] w-full overflow-auto whitespace-pre-line rounded-md border border-gray-200 bg-black p-5 text-gray-50 dark:border-gray-700"]) }}
 >
     {{ $slot }}
 </div>

resources/views/databases/partials/create-backup-modal.blade.php

@@ -35,7 +35,7 @@ class="p-6"
             <div class="mt-1 flex items-center">
                 <x-select-input id="backup_storage" name="backup_storage" class="mt-1 w-full">
                     <option value="" selected disabled>{{ __("Select") }}</option>
-                    @foreach (auth()->user()->storageProviders as $st)
+                    @foreach (\App\Models\StorageProvider::getByProjectId(auth()->user()->current_project_id)->get() as $st)
                         <option value="{{ $st->id }}" @if(old('backup_storage') == $st->id) selected @endif>
                             {{ $st->profile }} - {{ $st->provider }}
                         </option>

resources/views/php/partials/installed-versions.blade.php

@@ -37,16 +37,19 @@ class="cursor-pointer"
                                             >
                                                 {{ __("Install Extension") }}
                                             </x-dropdown-link>
+                                            @foreach ([\App\Enums\PHPIniType::FPM, \App\Enums\PHPIniType::CLI] as $type)
                                                 <x-dropdown-link
                                                     class="cursor-pointer"
-                                                x-on:click="version = '{{ $php->version }}'; $dispatch('open-modal', 'update-php-ini'); document.getElementById('ini').value = 'Loading...';"
-                                                hx-get="{{ route('servers.php.get-ini', ['server' => $server, 'version' => $php->version]) }}"
+                                                    x-on:click="version = '{{ $php->version }}'; $dispatch('open-modal', 'update-php-ini-{{ $type }}'); document.getElementById('ini').value = 'Loading...';"
+                                                    hx-get="{{ route('servers.php.get-ini', ['server' => $server, 'version' => $php->version, 'type' => $type]) }}"
                                                     hx-swap="outerHTML"
-                                                hx-target="#update-php-ini-form"
-                                                hx-select="#update-php-ini-form"
+                                                    hx-target="#update-php-ini-{{ $type }}-form"
+                                                    hx-select="#update-php-ini-{{ $type }}-form"
                                                 >
-                                                {{ __("Edit php.ini") }}
+                                                    {{ __("Edit php.ini (:type)", ["type" => $type]) }}
                                                 </x-dropdown-link>
+                                            @endforeach
+
                                             <x-dropdown-link
                                                 class="cursor-pointer"
                                                 href="{{ route('servers.services.restart', ['server' => $server, 'service' => $php]) }}"
@@ -85,6 +88,7 @@ class="cursor-pointer"
         method="delete"
         x-bind:action="uninstallAction"
     />
-    @include("php.partials.update-php-ini")
+    @include("php.partials.update-php-ini", ["type" => \App\Enums\PHPIniType::CLI])
+    @include("php.partials.update-php-ini", ["type" => \App\Enums\PHPIniType::FPM])
     @include("php.partials.install-extension")
 </div>

resources/views/php/partials/update-php-ini.blade.php

@@ -1,20 +1,21 @@
-<x-modal name="update-php-ini">
+<x-modal name="update-php-ini-{{ $type }}">
     <form
-        id="update-php-ini-form"
+        id="update-php-ini-{{ $type }}-form"
         hx-post="{{ route("servers.php.update-ini", ["server" => $server]) }}"
         hx-swap="outerHTML"
-        hx-select="#update-php-ini-form"
+        hx-select="#update-php-ini-{{ $type }}-form"
         class="p-6"
     >
+        <input type="hidden" name="type" value="{{ $type }}" />
         <input type="hidden" name="version" :value="version" />
 
         <h2 class="text-lg font-medium text-gray-900 dark:text-gray-100">
-            {{ __("Update php.ini") }}
+            {{ __("Update php.ini (:type)", ["type" => $type]) }}
         </h2>
 
         <div class="mt-6">
             <x-input-label for="ini" value="php.ini" />
-            <x-textarea id="ini" name="ini" class="mt-1 w-full" rows="15">
+            <x-textarea id="ini" name="ini" class="mt-1 w-full font-mono" rows="15">
                 {{ old("ini", session()->get("ini")) }}
             </x-textarea>
             @error("ini")

resources/views/profile/partials/two-factor-authentication.blade.php

@@ -46,6 +46,16 @@
                 <div class="mt-5">
                     {!! auth()->user()->twoFactorQrCodeSvg() !!}
                 </div>
+
+                <div class="mt-5">
+                    {{ __("If you are unable to scan the QR code, please use the 2FA secret instead.") }}
+                </div>
+
+                <div class="mt-2">
+                    <div class="inline-block rounded-md border border-gray-100 p-2 dark:border-gray-700">
+                        {{ decrypt(auth()->user()->two_factor_secret) }}
+                    </div>
+                </div>
             @endif
 
             {{-- Show 2FA Recovery Codes --}}

resources/views/scripts/partials/fields/content.blade.php

@@ -1,5 +1,5 @@
 <x-input-label for="content" :value="__('Content')" />
-<x-textarea id="content" name="content" class="mt-1 min-h-[400px] w-full">
+<x-textarea id="content" name="content" class="mt-1 min-h-[400px] w-full font-mono">
     {{ $value }}
 </x-textarea>
 @error("content")

resources/views/settings/notification-channels/partials/add-channel.blade.php

@@ -100,6 +100,15 @@ class="mt-1 w-full"
                 @enderror
             </div>
 
+            <div class="mt-6">
+                <x-checkbox id="global" name="global" :checked="old('global')" value="1">
+                    Is Global (Accessible in all projects)
+                </x-checkbox>
+                @error("global")
+                    <x-input-error class="mt-2" :messages="$message" />
+                @enderror
+            </div>
+
             <div class="mt-6 flex justify-end">
                 <x-secondary-button type="button" x-on:click="$dispatch('close')">
                     {{ __("Cancel") }}

resources/views/settings/notification-channels/partials/channels-list.blade.php

@@ -16,13 +16,29 @@
                         @include("settings.notification-channels.partials.icons." . $channel->provider)
                     </div>
                     <div class="ml-3 flex flex-grow flex-col items-start justify-center">
-                        <span class="mb-1">{{ $channel->label }}</span>
+                        <div class="mb-1 flex items-center">
+                            {{ $channel->label }}
+                            @if (! $channel->project_id)
+                                <x-status status="disabled" class="ml-2">GLOBAL</x-status>
+                            @endif
+                        </div>
                         <span class="text-sm text-gray-400">
                             <x-datetime :value="$channel->created_at" />
                         </span>
                     </div>
                     <div class="flex items-center">
                         <div class="inline">
+                            <x-icon-button
+                                id="edit-{{ $channel->id }}"
+                                hx-get="{{ route('settings.notification-channels', ['edit' => $channel->id]) }}"
+                                hx-replace-url="true"
+                                hx-select="#edit"
+                                hx-target="#edit"
+                                hx-ext="disable-element"
+                                hx-disable-element="#edit-{{ $channel->id }}"
+                            >
+                                <x-heroicon name="o-pencil" class="h-5 w-5" />
+                            </x-icon-button>
                             <x-icon-button
                                 x-on:click="deleteAction = '{{ route('settings.notification-channels.delete', $channel->id) }}'; $dispatch('open-modal', 'delete-channel')"
                             >
@@ -34,6 +50,12 @@
             @endforeach
 
             @include("settings.notification-channels.partials.delete-channel")
+
+            <div id="edit">
+                @if (isset($editChannel))
+                    @include("settings.notification-channels.partials.edit-notification-channel", ["notificationChannel" => $editChannel])
+                @endif
+            </div>
         @else
             <x-simple-card>
                 <div class="text-center">

resources/views/settings/notification-channels/partials/edit-notification-channel.blade.php

@@ -0,0 +1,59 @@
+<x-modal
+    name="edit-notification-channel"
+    :show="true"
+    x-on:modal-edit-notification-channel-closed.window="window.history.pushState('', '', '{{ route('settings.notification-channels') }}');"
+>
+    <form
+        id="edit-notification-channel-form"
+        hx-post="{{ route("settings.notification-channels.update", ["notificationChannel" => $notificationChannel->id]) }}"
+        hx-swap="outerHTML"
+        hx-select="#edit-notification-channel-form"
+        hx-ext="disable-element"
+        hx-disable-element="#btn-edit-notification-channel"
+        class="p-6"
+    >
+        @csrf
+
+        <h2 class="text-lg font-medium text-gray-900 dark:text-gray-100">
+            {{ __("Edit Channel") }}
+        </h2>
+
+        <div class="mt-6">
+            <x-input-label for="edit-label" value="Label" />
+            <x-text-input
+                value="{{ $notificationChannel->label }}"
+                id="edit-label"
+                name="label"
+                type="text"
+                class="mt-1 w-full"
+            />
+            @error("label")
+                <x-input-error class="mt-2" :messages="$message" />
+            @enderror
+        </div>
+
+        <div class="mt-6">
+            <x-checkbox
+                id="edit-global"
+                name="global"
+                :checked="old('global', $notificationChannel->project_id === null ? 1 : null)"
+                value="1"
+            >
+                Is Global (Accessible in all projects)
+            </x-checkbox>
+            @error("global")
+                <x-input-error class="mt-2" :messages="$message" />
+            @enderror
+        </div>
+
+        <div class="mt-6 flex justify-end">
+            <x-secondary-button type="button" x-on:click="$dispatch('close')">
+                {{ __("Cancel") }}
+            </x-secondary-button>
+
+            <x-primary-button id="btn-edit-notification-channel" class="ml-3">
+                {{ __("Save") }}
+            </x-primary-button>
+        </div>
+    </form>
+</x-modal>

resources/views/settings/server-providers/partials/connect-provider.blade.php

@@ -83,6 +83,15 @@ class="mt-1 w-full"
                 @enderror
             </div>
 
+            <div class="mt-6">
+                <x-checkbox id="global" name="global" :checked="old('global')" value="1">
+                    Is Global (Accessible in all projects)
+                </x-checkbox>
+                @error("global")
+                    <x-input-error class="mt-2" :messages="$message" />
+                @enderror
+            </div>
+
             <div class="mt-6 flex justify-end">
                 <x-secondary-button type="button" x-on:click="$dispatch('close')">
                     {{ __("Cancel") }}

resources/views/settings/server-providers/partials/edit-provider.blade.php

@@ -0,0 +1,59 @@
+<x-modal
+    name="edit-server-provider"
+    :show="true"
+    x-on:modal-edit-server-provider-closed.window="window.history.pushState('', '', '{{ route('settings.server-providers') }}');"
+>
+    <form
+        id="edit-server-provider-form"
+        hx-post="{{ route("settings.server-providers.update", ["serverProvider" => $serverProvider->id]) }}"
+        hx-swap="outerHTML"
+        hx-select="#edit-server-provider-form"
+        hx-ext="disable-element"
+        hx-disable-element="#btn-edit-server-provider"
+        class="p-6"
+    >
+        @csrf
+
+        <h2 class="text-lg font-medium text-gray-900 dark:text-gray-100">
+            {{ __("Edit Provider") }}
+        </h2>
+
+        <div class="mt-6">
+            <x-input-label for="edit-name" value="Name" />
+            <x-text-input
+                value="{{ $serverProvider->profile }}"
+                id="edit-name"
+                name="name"
+                type="text"
+                class="mt-1 w-full"
+            />
+            @error("name")
+                <x-input-error class="mt-2" :messages="$message" />
+            @enderror
+        </div>
+
+        <div class="mt-6">
+            <x-checkbox
+                id="edit-global"
+                name="global"
+                :checked="old('global', $serverProvider->project_id === null ? 1 : null)"
+                value="1"
+            >
+                Is Global (Accessible in all projects)
+            </x-checkbox>
+            @error("global")
+                <x-input-error class="mt-2" :messages="$message" />
+            @enderror
+        </div>
+
+        <div class="mt-6 flex justify-end">
+            <x-secondary-button type="button" x-on:click="$dispatch('close')">
+                {{ __("Cancel") }}
+            </x-secondary-button>
+
+            <x-primary-button id="btn-edit-server-provider" class="ml-3">
+                {{ __("Save") }}
+            </x-primary-button>
+        </div>
+    </form>
+</x-modal>

resources/views/settings/server-providers/partials/providers-list.blade.php

@@ -18,13 +18,29 @@ class="h-10 w-10"
                         />
                     </div>
                     <div class="ml-3 flex flex-grow flex-col items-start justify-center">
-                        <span class="mb-1">{{ $provider->profile }}</span>
+                        <div class="mb-1 flex items-center">
+                            {{ $provider->profile }}
+                            @if (! $provider->project_id)
+                                <x-status status="disabled" class="ml-2">GLOBAL</x-status>
+                            @endif
+                        </div>
                         <span class="text-sm text-gray-400">
                             <x-datetime :value="$provider->created_at" />
                         </span>
                     </div>
                     <div class="flex items-center">
                         <div class="inline">
+                            <x-icon-button
+                                id="edit-{{ $provider->id }}"
+                                hx-get="{{ route('settings.server-providers', ['edit' => $provider->id]) }}"
+                                hx-replace-url="true"
+                                hx-select="#edit"
+                                hx-target="#edit"
+                                hx-ext="disable-element"
+                                hx-disable-element="#edit-{{ $provider->id }}"
+                            >
+                                <x-heroicon name="o-pencil" class="h-5 w-5" />
+                            </x-icon-button>
                             <x-icon-button
                                 x-on:click="deleteAction = '{{ route('settings.server-providers.delete', $provider->id) }}'; $dispatch('open-modal', 'delete-provider')"
                             >
@@ -36,6 +52,12 @@ class="h-10 w-10"
             @endforeach
 
             @include("settings.server-providers.partials.delete-provider")
+
+            <div id="edit">
+                @if (isset($editProvider))
+                    @include("settings.server-providers.partials.edit-provider", ["serverProvider" => $editProvider])
+                @endif
+            </div>
         @else
             <x-simple-card>
                 <div class="text-center">

resources/views/settings/source-controls/partials/edit-source-control.blade.php

@@ -109,7 +109,7 @@ class="text-primary-500"
 
         <div class="mt-6">
             <x-checkbox
-                id="global"
+                id="edit-global"
                 name="global"
                 :checked="old('global', $sourceControl->project_id === null ? 1 : null)"
                 value="1"

resources/views/settings/storage-providers/partials/connect-provider.blade.php

@@ -201,6 +201,15 @@ class="mt-1 w-full"
                 </div>
             @endif
 
+            <div class="mt-6">
+                <x-checkbox id="global" name="global" :checked="old('global')" value="1">
+                    Is Global (Accessible in all projects)
+                </x-checkbox>
+                @error("global")
+                    <x-input-error class="mt-2" :messages="$message" />
+                @enderror
+            </div>
+
             <div class="mt-6 flex justify-end">
                 <x-secondary-button type="button" x-on:click="$dispatch('close')">
                     {{ __("Cancel") }}

resources/views/settings/storage-providers/partials/edit-provider.blade.php

@@ -0,0 +1,59 @@
+<x-modal
+    name="edit-storage-provider"
+    :show="true"
+    x-on:modal-edit-storage-provider-closed.window="window.history.pushState('', '', '{{ route('settings.storage-providers') }}');"
+>
+    <form
+        id="edit-storage-provider-form"
+        hx-post="{{ route("settings.storage-providers.update", ["storageProvider" => $storageProvider->id]) }}"
+        hx-swap="outerHTML"
+        hx-select="#edit-storage-provider-form"
+        hx-ext="disable-element"
+        hx-disable-element="#btn-edit-storage-provider"
+        class="p-6"
+    >
+        @csrf
+
+        <h2 class="text-lg font-medium text-gray-900 dark:text-gray-100">
+            {{ __("Edit Provider") }}
+        </h2>
+
+        <div class="mt-6">
+            <x-input-label for="edit-name" value="Name" />
+            <x-text-input
+                value="{{ $storageProvider->profile }}"
+                id="edit-name"
+                name="name"
+                type="text"
+                class="mt-1 w-full"
+            />
+            @error("name")
+                <x-input-error class="mt-2" :messages="$message" />
+            @enderror
+        </div>
+
+        <div class="mt-6">
+            <x-checkbox
+                id="edit-global"
+                name="global"
+                :checked="old('global', $storageProvider->project_id === null ? 1 : null)"
+                value="1"
+            >
+                Is Global (Accessible in all projects)
+            </x-checkbox>
+            @error("global")
+                <x-input-error class="mt-2" :messages="$message" />
+            @enderror
+        </div>
+
+        <div class="mt-6 flex justify-end">
+            <x-secondary-button type="button" x-on:click="$dispatch('close')">
+                {{ __("Cancel") }}
+            </x-secondary-button>
+
+            <x-primary-button id="btn-edit-storage-provider" class="ml-3">
+                {{ __("Save") }}
+            </x-primary-button>
+        </div>
+    </form>
+</x-modal>

resources/views/settings/storage-providers/partials/providers-list.blade.php

@@ -18,13 +18,29 @@ class="h-10 w-10"
                         />
                     </div>
                     <div class="ml-3 flex flex-grow flex-col items-start justify-center">
-                        <span class="mb-1">{{ $provider->profile }}</span>
+                        <div class="mb-1 flex items-center">
+                            {{ $provider->profile }}
+                            @if (! $provider->project_id)
+                                <x-status status="disabled" class="ml-2">GLOBAL</x-status>
+                            @endif
+                        </div>
                         <span class="text-sm text-gray-400">
                             <x-datetime :value="$provider->created_at" />
                         </span>
                     </div>
                     <div class="flex items-center">
                         <div class="inline">
+                            <x-icon-button
+                                id="edit-{{ $provider->id }}"
+                                hx-get="{{ route('settings.storage-providers', ['edit' => $provider->id]) }}"
+                                hx-replace-url="true"
+                                hx-select="#edit"
+                                hx-target="#edit"
+                                hx-ext="disable-element"
+                                hx-disable-element="#edit-{{ $provider->id }}"
+                            >
+                                <x-heroicon name="o-pencil" class="h-5 w-5" />
+                            </x-icon-button>
                             <x-icon-button
                                 x-on:click="deleteAction = '{{ route('settings.storage-providers.delete', $provider->id) }}'; $dispatch('open-modal', 'delete-provider')"
                             >
@@ -36,6 +52,12 @@ class="h-10 w-10"
             @endforeach
 
             @include("settings.storage-providers.partials.delete-storage-provider")
+
+            <div id="edit">
+                @if (isset($editProvider))
+                    @include("settings.storage-providers.partials.edit-provider", ["storageProvider" => $editProvider])
+                @endif
+            </div>
         @else
             <x-simple-card>
                 <div class="text-center">

resources/views/site-settings/partials/update-v-host.blade.php

@@ -22,7 +22,7 @@ class="space-y-6"
             hx-swap="outerHTML"
         >
             <div id="vhost-container">
-                <x-textarea id="vhost" name="vhost" rows="10" class="mt-1 block min-h-[400px] w-full">
+                <x-textarea id="vhost" name="vhost" rows="10" class="mt-1 block min-h-[400px] w-full font-mono">
                     {{ session()->has("vhost") ? session()->get("vhost") : "Loading..." }}
                 </x-textarea>
             </div>

resources/views/sites/partials/create/fields/source-control.blade.php

@@ -3,7 +3,7 @@
     <div class="mt-1 flex items-center">
         <x-select-input id="source_control" name="source_control" class="mt-1 w-full">
             <option value="" selected>{{ __("Select") }}</option>
-            @foreach (\App\Models\SourceControl::getByCurrentProject() as $sourceControl)
+            @foreach (\App\Models\SourceControl::getByProjectId(auth()->user()->current_project_id)->get() as $sourceControl)
                 <option
                     value="{{ $sourceControl->id }}"
                     @if($sourceControl->id == old('source_control', isset($site) ? $site->source_control_id : null)) selected @endif

routes/settings.php

@@ -31,6 +31,7 @@
     Route::get('/', [ServerProviderController::class, 'index'])->name('settings.server-providers');
     Route::post('connect', [ServerProviderController::class, 'connect'])->name('settings.server-providers.connect');
     Route::delete('delete/{serverProvider}', [ServerProviderController::class, 'delete'])->name('settings.server-providers.delete');
+    Route::post('edit/{serverProvider}', [ServerProviderController::class, 'update'])->name('settings.server-providers.update');
 });
 
 // source-controls
@@ -46,6 +47,7 @@
     Route::get('/', [StorageProviderController::class, 'index'])->name('settings.storage-providers');
     Route::post('connect', [StorageProviderController::class, 'connect'])->name('settings.storage-providers.connect');
     Route::delete('delete/{storageProvider}', [StorageProviderController::class, 'delete'])->name('settings.storage-providers.delete');
+    Route::post('edit/{storageProvider}', [StorageProviderController::class, 'update'])->name('settings.storage-providers.update');
 });
 
 // notification-channels
@@ -53,6 +55,7 @@
     Route::get('/', [NotificationChannelController::class, 'index'])->name('settings.notification-channels');
     Route::post('add', [NotificationChannelController::class, 'add'])->name('settings.notification-channels.add');
     Route::delete('delete/{id}', [NotificationChannelController::class, 'delete'])->name('settings.notification-channels.delete');
+    Route::post('edit/{notificationChannel}', [NotificationChannelController::class, 'update'])->name('settings.notification-channels.update');
 });
 
 // ssh-keys