Merge branch 'develop'

# Conflicts:
#	public/css/app.css
#	public/js/app.js

.env.example

@@ -26,6 +26,7 @@ SESSION_LIFETIME=120
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
+REDIS_CLIENT=predis
 
 MAIL_MAILER=smtp
 MAIL_HOST=smtp.mailtrap.io

.gitignore

@@ -12,4 +12,7 @@ npm-debug.log
 yarn-error.log
 .idea
 .php_cs.cache
+.php-cs-fixer.cache
 /public/js/resources*.js
+/storage/views/header.blade.php
+/storage/views/footer.blade.php

README.md

@@ -3,7 +3,7 @@
 With Ploi Core, you'll power-launch your webhosting company. 
 Using the ploi.io system as backbone you will be able to serve your customers your custom panel & feeling.
 
-<p align="center"><img src="https://ploi-core.io/images/featured.png" width="100%"></p>
+<p align="center"><img src="https://ploi-core.io/images/og.jpg" width="100%"></p>
 
 ## Documentation
 

app/Casts/SiteAlias.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Casts;
+
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+
+class SiteAlias implements CastsAttributes
+{
+    public function get($model, string $key, $value, array $attributes)
+    {
+        if (!$value) {
+            return [];
+        }
+
+        $data = json_decode($value, true);
+
+        sort($data);
+
+        return $data;
+    }
+
+    public function set($model, string $key, $value, array $attributes)
+    {
+        return json_encode($value);
+    }
+}

app/Console/Commands/Core/Cleanup.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Console\Commands\Core;
+
+use App\Models\SystemLog;
+use Illuminate\Console\Command;
+
+class Cleanup extends Command
+{
+    protected $signature = 'core:cleanup';
+
+    protected $description = 'Clean up any old logs';
+
+    public function handle()
+    {
+        if (!setting('rotate_logs_after')) {
+            return Command::SUCCESS;
+        }
+
+        $rotationDate = $this->getRotationDate();
+
+        $rotated = SystemLog::query()
+            ->where('created_at', '<', $rotationDate)
+            ->delete();
+
+        $this->info('Rotated ' . $rotated . ' system logs!');
+
+        return Command::SUCCESS;
+    }
+
+    protected function getRotationDate()
+    {
+        switch (setting('rotate_logs_after')) {
+            case 'weeks-1':
+                return now()->subWeek();
+                break;
+            case 'months-1':
+                return now()->subMonth();
+                break;
+            case 'months-3':
+                return now()->subMonths(3);
+                break;
+            case 'months-6':
+                return now()->subMonths(6);
+                break;
+            case 'years-1':
+                return now()->subYear();
+                break;
+            case 'years-2':
+                return now()->subYears(2);
+                break;
+            case 'years-3':
+                return now()->subYears(3);
+                break;
+            case 'years-4':
+                return now()->subYears(4);
+                break;
+        }
+    }
+}

app/Console/Commands/Core/Install.php

@@ -7,6 +7,7 @@ use App\Models\User;
 use RuntimeException;
 use App\Models\Package;
 use App\Services\Ploi\Ploi;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Console\Command;
 use App\Services\VersionChecker;
@@ -41,6 +42,9 @@ class Install extends Command
         $this->line(' ');
         $this->writeSeparationLine();
         $this->info('Make sure to also setup emailing, the cronjob and the queue worker.');
+        $this->line(' ');
+        $this->info('Setting up emailing: https://docs.ploi-core.io/getting-started/setting-up-email');
+        $this->info('Setting up cronjob & queue worker: https://docs.ploi-core.io/getting-started/installation');
         $this->writeSeparationLine();
         $this->line(' ');
         $this->info('Visit your platform at ' . env('APP_URL'));
@@ -53,28 +57,32 @@ class Install extends Command
 
     protected function askAboutAdministrationAccount()
     {
-        $this->info('Let\'s start by setting up your administration account.');
+        if (!User::query()->where('role', User::ADMIN)->count()) {
+            $this->info('Let\'s start by setting up your administration account.');
 
-        $name = $this->ask('What is your name', $this->company['user_name']);
-        $email = $this->ask('What is your e-mail address', $this->company['email']);
-        $password = $this->secret('What password do you desire');
+            $name = $this->ask('What is your name', $this->company['user_name']);
+            $email = $this->ask('What is your e-mail address', $this->company['email']);
+            $password = $this->secret('What password do you desire');
 
-        $check = User::where('email', $email)->count();
+            $check = User::where('email', $email)->count();
 
-        if ($check) {
-            $this->line('');
-            $this->comment('This user is already present in your system, please refresh your database or use different credentials.');
-            $this->comment('Aborting installation..');
+            if ($check) {
+                $this->line('');
+                $this->comment('This user is already present in your system, please refresh your database or use different credentials.');
+                $this->comment('Aborting installation..');
 
-            exit();
+                exit();
+            }
+
+            User::forceCreate([
+                'name' => $name,
+                'email' => $email,
+                'password' => $password,
+                'role' => User::ADMIN
+            ]);
+        } else {
+            $this->line('Already found a administrator user in your system. Use that user to login.');
         }
-
-        User::forceCreate([
-            'name' => $name,
-            'email' => $email,
-            'password' => $password,
-            'role' => User::ADMIN
-        ]);
     }
 
     protected function askAboutDefaultPackages()
@@ -145,7 +153,9 @@ class Install extends Command
             ->get((new Ploi)->url . 'ping');
 
         if (!$response->ok() || !$response->json()) {
-            return false;
+            return [
+                'error' => Arr::get($response->json(), 'message', 'An unknown error has occurred.')
+            ];
         }
 
         return $response->json();
@@ -192,9 +202,9 @@ class Install extends Command
     {
         if (!config('app.key')) {
             $this->call('key:generate');
-        }
 
-        $this->info('Application key has been set');
+            $this->info('Application key has been set');
+        }
     }
 
     protected function checkApplicationUrl()
@@ -281,6 +291,18 @@ class Install extends Command
             exit();
         }
 
+        if (isset($this->company['error'])) {
+            $this->error($this->company['error']);
+
+            exit();
+        }
+
+        if ($this->company['user']['subscription'] !== 'unlimited') {
+            $this->error('Your subscription does not cover the usage of Ploi Core. Please upgrade your subscription to Unlimited.');
+
+            exit();
+        }
+
         $this->writeToEnvironmentFile('PLOI_TOKEN', $ploiApiToken);
         $this->writeToEnvironmentFile('PLOI_CORE_TOKEN', $ploiCoreKey);
 
@@ -293,7 +315,7 @@ class Install extends Command
     protected function runDatabaseMigrations()
     {
         $this->info('Running database migrations..');
-        $this->call('migrate');
+        $this->call('migrate', ['--force' => true]);
         $this->info('Database migrations successful');
     }
 

app/Console/Kernel.php

@@ -4,6 +4,7 @@ namespace App\Console;
 
 use App\Jobs\Core\Ping;
 use App\Console\Commands\Core\Css;
+use App\Console\Commands\Core\Cleanup;
 use App\Console\Commands\Core\Install;
 use App\Console\Commands\Core\CssBackup;
 use App\Console\Commands\Core\Synchronize;
@@ -17,6 +18,7 @@ class Kernel extends ConsoleKernel
         CssBackup::class,
         Install::class,
         Synchronize::class,
+        Cleanup::class,
     ];
 
     protected function schedule(Schedule $schedule)
@@ -24,5 +26,7 @@ class Kernel extends ConsoleKernel
         $schedule->call(function () {
             dispatch(new Ping())->delay(now()->addMinutes(rand(1, 30)));
         })->dailyAt('02:00');
+
+        $schedule->command('core:cleanup')->daily();
     }
 }

app/Http/Controllers/Admin/DashboardController.php

@@ -10,14 +10,17 @@ use App\Http\Controllers\Controller;
 
 class DashboardController extends Controller
 {
-    public function index()
+    public function __invoke()
     {
         return inertia('Admin/Dashboard', [
             'servers' => Server::count(),
             'sites' => Site::count(),
             'users' => User::count(),
-            'logs' => SystemLog::latest()->limit(10)->with('model')->get()
-                ->map(function (SystemLog $systemLog) {
+            'logs' => SystemLog::query()
+                ->latest()
+                ->with('model')
+                ->paginate(5)
+                ->through(function (SystemLog $systemLog) {
                     return [
                         'title' => __($systemLog->title, [
                             'site' => $systemLog->model->domain ?? '-Unknown-'

app/Http/Controllers/Admin/ProviderController.php

@@ -14,6 +14,8 @@ class ProviderController extends Controller
 
         return inertia('Admin/Services/Provider/Edit', [
             'provider' => $provider,
+            'availablePlans' => $provider->plans()->pluck('label', 'id'),
+            'availableRegions' => $provider->regions()->pluck('label', 'id'),
         ]);
     }
 

app/Http/Controllers/Admin/ServerController.php

@@ -4,12 +4,39 @@ namespace App\Http\Controllers\Admin;
 
 use App\Models\User;
 use App\Models\Server;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Http\Resources\Admin\ServerResource;
 use App\Http\Requests\Admin\ServerAttachRequest;
 
 class ServerController extends Controller
 {
+    public function index()
+    {
+        return inertia('Admin/Servers/Index', [
+            'filters' => request()->all('search'),
+            'servers' => ServerResource::collection(
+                Server::query()
+                    ->when(request()->input('search'), function (Builder $query, $value) {
+                        return $query
+                            ->where('name', 'like', '%' . $value . '%')
+                            ->orWhere('ip', 'like', '%' . $value . '%')
+                            ->orWhereHas('users', function (Builder $query) use ($value) {
+                                return $query
+                                    ->where('name', 'LIKE', '%' . $value . '%')
+                                    ->orWhere('email', 'LIKE', '%' . $value . '%');
+                            });
+                    })
+                    ->with('users:id,name')
+                    ->withCount('sites')
+                    ->latest()
+                    ->paginate(config('core.pagination.per_page'))
+                    ->withQueryString()
+            )
+        ]);
+    }
+
     public function edit($id)
     {
         $server = Server::findOrFail($id);

app/Http/Controllers/Admin/ServiceController.php

@@ -12,12 +12,12 @@ class ServiceController extends Controller
     public function index()
     {
         return inertia('Admin/Services/Index', [
-            'servers' => Server::withCount('sites')->latest()->paginate(5, ['*'], 'servers_per_page'),
-            'sites' => Site::with('server:id,name')->latest()->paginate(5, ['*'], 'sites_per_page'),
+            'servers' => Server::query()->withCount('sites', 'users')->latest()->paginate(config('core.pagination.per_page'), ['*'], 'servers_per_page'),
+            'sites' => Site::with('server:id,name')->withCount('users')->latest()->paginate(config('core.pagination.per_page'), ['*'], 'sites_per_page'),
             'providers' => Provider::query()
                 ->withCount('regions', 'plans', 'servers')
                 ->latest()
-                ->paginate(5, ['*'], 'providers_per_page'),
+                ->paginate(config('core.pagination.per_page'), ['*'], 'providers_per_page'),
         ]);
     }
 }

app/Http/Controllers/Admin/SettingController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
 
 use App\Models\Package;
 use Illuminate\Support\Str;
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Storage;
 use App\Http\Requests\Admin\SettingRequest;
@@ -21,10 +22,13 @@ class SettingController extends Controller
             'allow_registration' => setting('allow_registration'),
             'default_package' => setting('default_package'),
             'receive_email_on_server_creation' => setting('receive_email_on_server_creation'),
+            'receive_email_on_site_creation' => setting('receive_email_on_site_creation'),
             'isolate_per_site_per_user' => setting('isolate_per_site_per_user'),
             'enable_api' => setting('enable_api'),
             'api_token' => setting('api_token') ? decrypt(setting('api_token')) : null,
-            'default_language' => setting('default_language', 'en')
+            'rotate_logs_after' => setting('rotate_logs_after') ? setting('rotate_logs_after') : null,
+            'default_language' => setting('default_language', 'en'),
+            'has_logo' => (bool)setting('logo'),
         ];
 
         $packages = Package::pluck('name', 'id');
@@ -47,10 +51,12 @@ class SettingController extends Controller
             'documentation',
             'default_package',
             'receive_email_on_server_creation',
+            'receive_email_on_site_creation',
             'isolate_per_site_per_user',
             'enable_api',
             'api_token',
-            'default_language'
+            'default_language',
+            'rotate_logs_after',
         ]) as $key => $value) {
             if ($key === 'api_token') {
                 $value = encrypt($value);
@@ -87,4 +93,51 @@ class SettingController extends Controller
 
         return redirect()->route('admin.settings')->with('success', __('Settings have been updated'));
     }
+
+    public function terms()
+    {
+        return inertia('Admin/Terms', [
+            'terms_settings' => [
+                'logo' => setting('logo'),
+                'name' => setting('name'),
+                'terms_required' => setting('accept_terms_required'),
+                'terms' => setting('terms'),
+                'privacy' => setting('privacy')
+            ]
+        ]);
+    }
+
+    public function updateTerms(Request $request)
+    {
+        setting(['accept_terms_required' => $request->input('terms_required'),]);
+        setting(['terms' => $request->input('terms'),]);
+        setting(['privacy' => $request->input('privacy'),]);
+
+        return redirect()->route('admin.settings.terms')->with('success', __('Terms have been updated'));
+    }
+
+    public function termsTemplate(Request $request)
+    {
+        $template = file_get_contents(storage_path('templates/terms-of-service.md'));
+        $template = str_replace([
+            '{NAME}',
+            '{WEBSITE}',
+            '{DATE}'
+        ], [
+            setting('name'),
+            config('app.url'),
+            date('Y-m-d')
+        ], $template);
+
+        return ['content' => $template];
+    }
+
+    public function removeLogo(Request $request)
+    {
+        Storage::delete(setting('logo'));
+
+        setting(['logo' => null]);
+
+        return redirect()->back()->with('success', 'Logo has ben removed');
+    }
 }

app/Http/Controllers/Admin/SiteController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Http\Resources\Admin\SiteResource;
 use App\Models\Site;
 use App\Models\User;
 use Illuminate\Http\Request;
@@ -10,6 +11,23 @@ use App\Http\Requests\Admin\ServerAttachRequest;
 
 class SiteController extends Controller
 {
+    public function index()
+    {
+        return inertia('Admin/Sites/Index', [
+            'filters' => request()->all('search'),
+            'sites' => SiteResource::collection(
+                Site::query()
+                    ->when(request()->input('search'), function ($query, $value) {
+                        return $query->where('domain', 'like', '%' . $value . '%');
+                    })
+                    ->with('server:id,name', 'users:id,name')
+                    ->latest()
+                    ->paginate(config('core.pagination.per_page'))
+                    ->withQueryString()
+            )
+        ]);
+    }
+
     public function edit($id)
     {
         $site = Site::findOrFail($id);

app/Http/Controllers/Admin/SynchronizeProviderController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Models\Provider;
-use App\Services\Ploi\Ploi;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
@@ -11,15 +10,15 @@ class SynchronizeProviderController extends Controller
 {
     public function index()
     {
-        if (config('app.demo')) {
+        if ($this->isDemo()) {
             return redirect('/')->with('info', __('This feature is not available in demo mode.'));
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $availableProviders = $this->getPloi()->user()->serverProviders()->getData();
 
-        $availableProviders = $ploi->user()->serverProviders()->getData();
-
-        $currentProviders = Provider::whereNotIn('id', array_keys((array)$availableProviders))->get();
+        $currentProviders = Provider::query()
+            ->whereNotIn('id', array_keys((array)$availableProviders))
+            ->get();
 
         return inertia('Admin/Services/Providers', [
             'availableProviders' => $availableProviders,
@@ -29,7 +28,7 @@ class SynchronizeProviderController extends Controller
 
     public function synchronize(Request $request, $providerId)
     {
-        $ploiProvider = (new Ploi)->user()->serverProviders($providerId)->getData();
+        $ploiProvider = $this->getPloi()->user()->serverProviders($providerId)->getData();
 
         $provider = Provider::updateOrCreate([
             'ploi_id' => $ploiProvider->id,

app/Http/Controllers/Admin/SynchronizeServerController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Models\Server;
-use App\Services\Ploi\Ploi;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
@@ -11,15 +10,15 @@ class SynchronizeServerController extends Controller
 {
     public function index()
     {
-        if (config('app.demo')) {
+        if ($this->isDemo()) {
             return redirect('/')->with('info', __('This feature is not available in demo mode.'));
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $availableServers = $this->getPloi()->synchronize()->servers()->getData();
 
-        $availableServers = $ploi->synchronize()->servers()->getData();
-
-        $currentServers = Server::whereNotIn('id', array_keys((array)$availableServers))->get();
+        $currentServers = Server::query()
+            ->whereNotIn('id', array_keys((array)$availableServers))
+            ->get();
 
         return inertia('Admin/Services/Servers', [
             'availableServers' => $availableServers,
@@ -29,15 +28,37 @@ class SynchronizeServerController extends Controller
 
     public function synchronizeServer(Request $request)
     {
-        Server::updateOrCreate([
-            'ploi_id' => $request->input('id')
-        ], [
-            'status' => $request->input('status'),
-            'name' => $request->input('name'),
-            'ip' => $request->input('ip_address'),
-            'ssh_port' => $request->input('ssh_port', 22),
-            'internal_ip' => $request->input('internal_ip'),
-            'available_php_versions' => $request->input('installed_php_versions')
-        ]);
+        Server::query()
+            ->updateOrCreate([
+                'ploi_id' => $request->input('id')
+            ], [
+                'status' => $request->input('status'),
+                'name' => $request->input('name'),
+                'ip' => $request->input('ip_address'),
+                'ssh_port' => $request->input('ssh_port', 22),
+                'internal_ip' => $request->input('internal_ip'),
+                'available_php_versions' => $request->input('installed_php_versions')
+            ]);
+    }
+
+    public function synchronizeAll(Request $request)
+    {
+        $availableServers = $this->getPloi()->synchronize()->servers()->getData();
+
+        foreach ($availableServers as $availableServer) {
+            Server::query()
+                ->updateOrCreate([
+                    'ploi_id' => $availableServer->id
+                ], [
+                    'status' => $availableServer->status,
+                    'name' => $availableServer->name,
+                    'ip' => $availableServer->ip_address,
+                    'ssh_port' => $availableServer->ssh_port,
+                    'internal_ip' => $availableServer->internal_ip,
+                    'available_php_versions' => $availableServer->installed_php_versions
+                ]);
+        }
+
+        return response('ok');
     }
 }

app/Http/Controllers/Admin/SynchronizeSiteController.php

@@ -2,12 +2,85 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Models\Site;
+use App\Models\Server;
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
 class SynchronizeSiteController extends Controller
 {
     public function index()
     {
-        return inertia('Admin/Services/Sites');
+        if ($this->isDemo()) {
+            return redirect('/')->with('info', __('This feature is not available in demo mode.'));
+        }
+
+        $availableSites = $this->getPloi()->synchronize()->sites()->getData();
+
+        $currentSites = Site::query()
+            ->whereNotIn('id', array_keys((array)$availableSites))
+            ->get();
+
+        return inertia('Admin/Services/Sites', [
+            'availableSites' => $availableSites,
+            'currentSites' => $currentSites
+        ]);
+    }
+
+    public function synchronizeSite(Request $request)
+    {
+        $server = Server::query()->where('ploi_id', $request->input('server_id'))->firstOrFail();
+
+        /* @var $site \App\Models\Site */
+        $site = Site::query()
+            ->updateOrCreate([
+                'ploi_id' => $request->input('id')
+            ], [
+                'domain' => $request->input('domain'),
+                'php_version' => $request->input('php_version'),
+                'project' => $request->input('project_type')
+            ]);
+
+        $site->status = $request->input('status');
+        $site->server_id = $server->id;
+        $site->save();
+
+        $certificates = $this->getPloi()->server($request->input('server_id'))->sites($request->input('id'))->certificates()->get()->getData();
+
+        if ($certificates) {
+            foreach ($certificates as $certificate) {
+                $site->certificates()->updateOrCreate([
+                    'ploi_id' => $certificate->id,
+                ], [
+                    'status' => $certificate->status,
+                    'ploi_id' => $certificate->id,
+                    'domain' => $certificate->domain,
+                    'type' => $certificate->type,
+                ]);
+            }
+        }
+
+        return response('ok');
+    }
+
+    public function synchronizeAll(Request $request)
+    {
+        $availableSites = $this->getPloi()->synchronize()->sites()->getData();
+
+        foreach ($availableSites as $availableSite) {
+            $server = Server::query()->where('ploi_id', $availableSite->server_id)->firstOrFail();
+
+            $site = Site::query()
+                ->updateOrCreate([
+                    'ploi_id' => $availableSite->id
+                ], [
+                    'domain' => $availableSite->domain,
+                    'php_version' => $availableSite->php_version,
+                ]);
+
+            $site->status = $availableSite->status;
+            $site->server_id = $server->id;
+            $site->save();
+        }
     }
 }

app/Http/Controllers/Admin/SystemController.php

@@ -6,15 +6,12 @@ use Illuminate\Http\Request;
 use App\Jobs\Core\UpdateSystem;
 use App\Services\VersionChecker;
 use App\Http\Controllers\Controller;
+use Laravel\Horizon\Contracts\MasterSupervisorRepository;
 
 class SystemController extends Controller
 {
-    public function index()
+    public function index(MasterSupervisorRepository $masterSupervisorRepository)
     {
-        if (config('app.demo')) {
-            return redirect('/')->with('info', __('This feature is not available in demo mode.'));
-        }
-
         $version = (new VersionChecker)->getVersions();
 
         return inertia('Admin/System', [
@@ -22,7 +19,8 @@ class SystemController extends Controller
                 'out_of_date' => $version->isOutOfDate(),
                 'current' => $version->currentVersion,
                 'remote' => $version->remoteVersion
-            ]
+            ],
+            'horizonRunning' => !!$masterSupervisorRepository->all()
         ]);
     }
 

app/Http/Controllers/Admin/UserController.php

@@ -11,12 +11,14 @@ class UserController extends Controller
 {
     public function index()
     {
-        $users = User::with('package:id,name')
+        $users = User::query()
+            ->withCount('sites', 'servers')
+            ->with('package:id,name')
             ->when(request()->input('search'), function ($query, $value) {
                 return $query->where('name', 'like', '%' . $value . '%')->orWhere('email', 'like', '%' . $value . '%');
             })
             ->latest()
-            ->paginate(5);
+            ->paginate(config('core.pagination.per_page'));
 
         return inertia('Admin/Users/Index', [
             'filters' => request()->all('search'),
@@ -45,8 +47,8 @@ class UserController extends Controller
             $user->save();
         }
 
-        if ($package = $request->input('package')) {
-            $user->package_id = $package;
+        if ($request->input('package') && Package::find($request->input('package'))) {
+            $user->package_id = $request->input('package');
             $user->save();
         }
 
@@ -57,9 +59,9 @@ class UserController extends Controller
     {
         $user = User::query()->findOrFail($id);
 
-        $servers = $user->servers()->withCount('sites')->latest()->paginate(5, ['*'], 'page_servers');
+        $servers = $user->servers()->withCount('sites')->latest()->paginate(config('core.pagination.per_page'), ['*'], 'page_servers');
 
-        $sites = $user->sites()->with('server:id,name')->latest()->paginate(5, ['*'], 'page_sites');
+        $sites = $user->sites()->with('server:id,name')->latest()->paginate(config('core.pagination.per_page'), ['*'], 'page_sites');
 
         return inertia('Admin/Users/Show', [
             'user' => $user,

app/Http/Controllers/Auth/RegisterController.php

@@ -28,7 +28,7 @@ class RegisterController extends Controller
 
     protected function validator(array $data)
     {
-        return Validator::make($data, [
+        $rules = [
             'name' => ['required', 'string', 'max:255'],
             'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
             'password' => [
@@ -40,7 +40,15 @@ class RegisterController extends Controller
                     ->numbers()
                     ->uncompromised()
             ],
-        ]);
+        ];
+
+        if (setting('accept_terms_required')) {
+            $rules['terms'] = [
+                'accepted'
+            ];
+        }
+
+        return Validator::make($data, $rules);
     }
 
     protected function create(array $data)

app/Http/Controllers/Controller.php

@@ -2,11 +2,17 @@
 
 namespace App\Http\Controllers;
 
+use App\Traits\HasPloi;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 
 class Controller extends BaseController
 {
-    use ValidatesRequests, AuthorizesRequests;
+    use ValidatesRequests, AuthorizesRequests, HasPloi;
+
+    protected function isDemo()
+    {
+        return config('app.demo');
+    }
 }

app/Http/Controllers/PageController.php

@@ -2,10 +2,29 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Support\Str;
+
 class PageController extends Controller
 {
     public function installationIncomplete()
     {
         return inertia('Core/InstallationIncomplete');
     }
+
+    public function show($slug)
+    {
+        if ($slug === 'terms-of-service' && setting('terms')) {
+            return inertia('Pages/Terms', [
+                'content' => Str::markdown(setting('terms'))
+            ]);
+        }
+
+        if ($slug === 'privacy-policy' && setting('privacy')) {
+            return inertia('Pages/Privacy', [
+                'content' => Str::markdown(setting('privacy'))
+            ]);
+        }
+
+        abort(404);
+    }
 }

app/Http/Controllers/Profile/ProfileBillingController.php

@@ -77,11 +77,14 @@ class ProfileBillingController extends Controller
             return inertia('Profile/BillingError');
         }
 
+        $subscription = $user->subscription();
+
         return inertia('Profile/Billing', [
             'packages' => $packages,
             'countries' => countries(),
-            'subscription' => $user->subscription('default'),
+            'subscription' => $subscription,
             'public_key' => config('cashier.key'),
+            'ends' => $subscription ? Carbon::createFromTimeStamp($subscription->asStripeSubscription()->current_period_end)->format('F jS, Y') ?? null : null,
             'data_client_secret' => $clientSecret,
             'card' => [
                 'last_four' => $user->card_last_four,
@@ -122,6 +125,16 @@ class ProfileBillingController extends Controller
         return redirect()->route('profile.billing.index')->with('success', 'Your card has been added, you can now update your plan');
     }
 
+    public function deleteCard(Request $request)
+    {
+        /** @var User $user */
+        $user = $request->user();
+
+        $user->deletePaymentMethods();
+
+        return redirect()->route('profile.billing.index')->with('success', 'Your credit card has been removed from your account');
+    }
+
     public function updatePlan(Request $request)
     {
         /** @var User $user */
@@ -210,6 +223,7 @@ class ProfileBillingController extends Controller
             Package::CURRENCY_GBP => 'GBP £',
             Package::CURRENCY_INR => 'INR ₹',
             Package::CURRENCY_THB => 'THB ',
+            Package::CURRENCY_BRL=> 'BRL R$ ',
         ];
 
         return $currencies[strtolower($key)] ?? '$';

app/Http/Controllers/Profile/ProfileController.php

@@ -37,4 +37,21 @@ class ProfileController extends Controller
 
         return $mode;
     }
+
+    public function destroy(Request $request)
+    {
+        /* @var $user \App\Models\User */
+        $user = $request->user();
+
+        $user->sites()->detach();
+        $user->servers()->detach();
+        $user->supportTicketReplies()->delete();
+        $user->supportTickets()->delete();
+
+        $user->delete();
+
+        auth()->logout();
+
+        return redirect()->route('login');
+    }
 }

app/Http/Controllers/ServerController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Server;
 use App\Models\User;
 use Illuminate\Http\Request;
 use App\Jobs\Servers\CreateServer;
@@ -38,7 +39,8 @@ class ServerController extends Controller
 
         /* @var $server \App\Models\Server */
         $server = $request->user()->servers()->create([
-            'name' => $request->input('name')
+            'name' => $request->input('name'),
+            'database_type' => $request->input('database_type', 'mysql')
         ]);
 
         $server->provider()->associate($provider);
@@ -65,6 +67,10 @@ class ServerController extends Controller
     {
         $server = auth()->user()->servers()->findOrFail($id);
 
+        if ($server->status === Server::STATUS_BUSY) {
+            return redirect()->back()->with('info', 'This server is currently busy, please check back later.');
+        }
+
         return inertia('Servers/Show', [
             'server' => $server,
             'sites' => $server->sites()->latest()->paginate(5, ['*'], 'sites_per_page'),
@@ -104,9 +110,21 @@ class ServerController extends Controller
     {
         $provider = $request->user()->package->providers()->findOrFail($providerId);
 
+        $regions = $provider->regions()
+            ->when($provider->allowed_regions, function ($query) use ($provider) {
+                return $query->whereIn('id', $provider->allowed_regions);
+            })
+            ->pluck('label', 'id');
+
+        $plans = $provider->plans()
+            ->when($provider->allowed_plans, function ($query) use ($provider) {
+                return $query->whereIn('id', $provider->allowed_plans);
+            })
+            ->pluck('label', 'id');
+
         return [
-            'regions' => $provider->regions()->pluck('label', 'id'),
-            'plans' => $provider->plans()->pluck('label', 'id'),
+            'regions' => $regions,
+            'plans' => $plans,
         ];
     }
 }

app/Http/Controllers/SiteAliasController.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\SiteAliasRequest;
+use App\Http\Resources\SiteAliasResource;
+use App\Jobs\Aliases\CreateAlias;
+use App\Jobs\Aliases\DeleteAlias;
+use Illuminate\Http\Request;
+
+class SiteAliasController extends Controller
+{
+    public function index($id)
+    {
+        $site = auth()->user()->sites()->findOrFail($id);
+
+        return inertia('Sites/Aliases', [
+            'site' => $site,
+            'aliases' => $site->aliases
+        ]);
+    }
+
+    public function store(SiteAliasRequest $request, $id)
+    {
+        $site = $request->user()->sites()->findOrFail($id);
+
+        $site->addAlias($request->input('domain'));
+
+        dispatch(new CreateAlias($site, $request->input('domain')));
+
+        return redirect()->route('sites.aliases.index', $id)->with('success', __('Alias has been created'));
+    }
+
+    public function destroy($id, $alias)
+    {
+        $site = auth()->user()->sites()->findOrFail($id);
+
+        dispatch(new DeleteAlias($site, $alias));
+
+        $site->removeAlias($alias);
+
+        return redirect()->route('sites.aliases.index', $id)->with('success', __('Alias has been deleted'));
+    }
+}

app/Http/Controllers/SiteCertificateController.php

@@ -25,6 +25,9 @@ class SiteCertificateController extends Controller
 
         $certificate = $site->certificates()->create([
             'domain' => $request->input('domain'),
+            'type' => $request->input('type', 'letsencrypt'),
+            'certificate' => $request->input('certificate'),
+            'private' => $request->input('private')
         ]);
 
         $certificate->server_id = $site->server_id;

app/Http/Controllers/SiteController.php

@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers;
 
+use App\Mail\Admin\Site\AdminSiteCreatedEmail;
 use App\Models\Server;
+use App\Models\User;
 use Illuminate\Support\Arr;
 use Illuminate\Http\Request;
 use App\Jobs\Sites\CreateSite;
@@ -10,6 +12,7 @@ use App\Jobs\Sites\DeleteSite;
 use App\Http\Requests\SiteRequest;
 use App\Http\Resources\SiteResource;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Mail;
 
 class SiteController extends Controller
 {
@@ -17,11 +20,12 @@ class SiteController extends Controller
     {
         $sites = auth()->user()
             ->sites()
+            ->with('server:id,name')
             ->when(request('server'), function ($query, $value) {
                 return $query->where('server_id', $value);
             })
             ->latest()
-            ->paginate(10);
+            ->paginate(config('core.pagination.per_page'));
 
         $availableServers = auth()->user()->servers()->pluck('name', 'id');
 
@@ -38,7 +42,17 @@ class SiteController extends Controller
         } else {
             $server = Server::query()
                 ->where('maximum_sites', '>', 0)
-                ->doesntHave('users')
+                ->where(function ($query) {
+                    return $query
+                        ->where(function ($query) {
+                            return $query->whereHas('users', function ($query) {
+                                return $query->where('user_id', auth()->id());
+                            });
+                        })
+                        ->orWhere(function ($query) {
+                            return $query->doesntHave('users');
+                        });
+                })
                 ->withCount('sites')
                 ->inRandomOrder()
                 ->first();
@@ -65,6 +79,14 @@ class SiteController extends Controller
             'description' => 'A new site has been created'
         ])->model()->associate($site)->save();
 
+        if (setting('receive_email_on_site_creation')) {
+            $admins = User::query()->where('role', User::ADMIN)->get();
+
+            foreach ($admins as $admin) {
+                Mail::to($admin)->send(new AdminSiteCreatedEmail($request->user(), $server, $site));
+            }
+        }
+
         return redirect()->route('sites.index')->with('success', __('Your website is being created'));
     }
 

app/Http/Kernel.php

@@ -16,7 +16,7 @@ class Kernel extends HttpKernel
     protected $middleware = [
         // \App\Http\Middleware\TrustHosts::class,
         \App\Http\Middleware\TrustProxies::class,
-        \Fruitcake\Cors\HandleCors::class,
+        \Illuminate\Http\Middleware\HandleCors::class,
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
@@ -68,6 +68,7 @@ class Kernel extends HttpKernel
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
+        'has.access' => \App\Http\Middleware\HasAccessToThisGroup::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'global.api.authenticated' => \App\Http\Middleware\GlobalApiAuthenticated::class,
         'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,

app/Http/Middleware/Demo.php

@@ -10,7 +10,7 @@ class Demo
     protected $safeRoutes = [
         'login',
         'logout',
-        //'profile/toggle-theme'
+        'profile/toggle-theme'
     ];
 
     protected $allowedIps = [

app/Http/Middleware/HandleInertiaRequests.php

@@ -87,7 +87,10 @@ class HandleInertiaRequests extends Middleware
                     'documentation' => setting('documentation', false),
                     'logo' => setting('logo'),
                     'allow_registration' => setting('allow_registration'),
-                    'billing' => config('cashier.key') && config('cashier.secret')
+                    'billing' => config('cashier.key') && config('cashier.secret'),
+                    'has_terms' => (bool)setting('terms'),
+                    'has_privacy' => (bool)setting('privacy'),
+                    'accept_terms_required' => (bool)setting('accept_terms_required')
                 ];
             },
             'flash' => function () {

app/Http/Middleware/HasAccessToThisGroup.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Arr;
+use Illuminate\Http\Request;
+
+class HasAccessToThisGroup
+{
+    public function handle(Request $request, Closure $next, $group)
+    {
+        if ($group === 'servers') {
+            $package = $request->user()->package ?? [];
+
+            if (
+                !Arr::get($package->server_permissions, 'create', false) &&
+                !Arr::get($package->server_permissions, 'update', false) &&
+                !Arr::get($package->server_permissions, 'delete', false)
+            ) {
+                abort(404);
+            }
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/TrustProxies.php

@@ -2,15 +2,15 @@
 
 namespace App\Http\Middleware;
 
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
-use Fideloper\Proxy\TrustProxies as Middleware;
 
 class TrustProxies extends Middleware
 {
     /**
      * The trusted proxies for this application.
      *
-     * @var array|string|null
+     * @var array<int, string>|string|null
      */
     protected $proxies;
 
@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
      *
      * @var int
      */
-    protected $headers = Request::HEADER_X_FORWARDED_ALL;
+    protected $headers =
+        Request::HEADER_X_FORWARDED_FOR |
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB;
 }

app/Http/Requests/Admin/PackageRequest.php

@@ -42,6 +42,7 @@ class PackageRequest extends FormRequest
                     Package::CURRENCY_GBP,
                     Package::CURRENCY_INR,
                     Package::CURRENCY_THB,
+                    Package::CURRENCY_BRL,
                 ])
             ],
             'maximum_sites' => [
@@ -83,8 +84,12 @@ class PackageRequest extends FormRequest
             $merge['price_monthly'] = 0.000;
         }
 
+        if (!$this->price_yearly) {
+            $merge['price_yearly'] = 0.000;
+        }
+
         // If we don't have the currency filled in, merge a default
-        if (!$this->price_monthly) {
+        if (!$this->price_monthly || !$this->price_yearly) {
             $merge['currency'] = Package::CURRENCY_USD;
         }
 

app/Http/Requests/Admin/ProviderRequest.php

@@ -28,6 +28,14 @@ class ProviderRequest extends FormRequest
                 'required',
                 'string',
                 'max:255'
+            ],
+            'allowed_plans' => [
+                'nullable',
+                'array'
+            ],
+            'allowed_regions' => [
+                'nullable',
+                'array'
             ]
         ];
     }

app/Http/Requests/ServerRequest.php

@@ -4,6 +4,7 @@ namespace App\Http\Requests;
 
 use App\Models\Server;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 
 class ServerRequest extends FormRequest
 {
@@ -45,6 +46,11 @@ class ServerRequest extends FormRequest
                 'required',
                 'not_in:0',
                 'exists:provider_plans,id'
+            ],
+            'database_type' => [
+                'required',
+                'string',
+                Rule::in(['mysql', 'mariadb', 'postgresql', 'postgresql13'])
             ]
         ];
     }

app/Http/Requests/SiteAliasRequest.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Rules\Hostname;
+use Illuminate\Foundation\Http\FormRequest;
+
+class SiteAliasRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return auth()->check();
+    }
+
+    public function rules()
+    {
+        return [
+            'domain' => [
+                'required',
+                'string',
+                new Hostname,
+            ]
+        ];
+    }
+}

app/Http/Requests/SiteCertificateRequest.php

@@ -25,15 +25,36 @@ class SiteCertificateRequest extends FormRequest
      */
     public function rules()
     {
-        return [
-            'domain' => [
-                'required',
-                'string',
-                Rule::unique('certificates', 'domain')->where(function ($query) {
-                    return $query->where('site_id', $this->route('site'));
-                }),
-                new LetsEncryptMatchHostWithIp($this->route('site'))
-            ]
-        ];
+        $rules = [];
+
+        if ($this->input('type') === 'letsencrypt') {
+            $rules = [
+                'domain' => [
+                    'required',
+                    'string',
+                    Rule::unique('certificates', 'domain')->where(function ($query) {
+                        return $query->where('site_id', $this->route('site'));
+                    }),
+                    new LetsEncryptMatchHostWithIp($this->route('site'))
+                ]
+            ];
+        }
+
+        if ($this->input('type') === 'custom') {
+            $rules = [
+                'certificate' => [
+                    'required',
+                    'string',
+                    'min:5'
+                ],
+                'private' => [
+                    'required',
+                    'string',
+                    'min:5'
+                ]
+            ];
+        }
+
+        return $rules;
     }
 }

app/Http/Resources/Admin/ServerResource.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Resources\Admin;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ServerResource extends JsonResource
+{
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'ip' => $this->ip,
+            'users' => $this->users,
+            'sites_count' => $this->sites_count,
+            'maximum_sites' => $this->maximum_sites,
+            'created_at' => $this->created_at->format('Y-m-d H:i:s')
+        ];
+    }
+}

app/Http/Resources/Admin/SiteResource.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Http\Resources\Admin;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class SiteResource extends JsonResource
+{
+    public function toArray($request)
+    {
+        return parent::toArray($request);
+    }
+}

app/Http/Resources/SiteResource.php

@@ -7,12 +7,6 @@ use Illuminate\Http\Resources\Json\JsonResource;
 
 class SiteResource extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
     public function toArray($request)
     {
         /* @var $this \App\Models\Site */
@@ -20,7 +14,11 @@ class SiteResource extends JsonResource
             'id' => $this->id,
             'status' => $this->parseStatus($this->status),
             'domain' => $this->domain,
+            'php_version' => $this->php_version,
             'project' => $this->project,
+            'server' => $this->server ? [
+                'name' => $this->server->name
+            ] : null,
             'created_at' => $this->created_at
         ];
     }

app/Jobs/Aliases/CreateAlias.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Jobs\Aliases;
+
+use App\Models\Site;
+use App\Traits\HasPloi;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class CreateAlias implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
+
+    public Site $site;
+    public string $alias;
+
+    public function __construct(Site $site, $alias)
+    {
+        $this->site = $site;
+        $this->alias = $alias;
+    }
+
+    public function handle()
+    {
+        $this->getPloi()
+            ->server($this->site->server->ploi_id)
+            ->sites($this->site->ploi_id)
+            ->aliases()
+            ->create([$this->alias]);
+    }
+
+    public function failed()
+    {
+        $this->site->aliases = array_diff($this->site->aliases, [$this->alias]);
+        $this->site->save();
+    }
+}

app/Jobs/Aliases/DeleteAlias.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Jobs\Aliases;
+
+use App\Models\Site;
+use App\Traits\HasPloi;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class DeleteAlias implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
+
+    public Site $site;
+    public string $alias;
+
+    public function __construct(Site $site, $alias)
+    {
+        $this->site = $site;
+        $this->alias = $alias;
+    }
+
+    public function handle()
+    {
+        $this->getPloi()
+            ->server($this->site->server->ploi_id)
+            ->sites($this->site->ploi_id)
+            ->aliases()
+            ->delete($this->alias);
+    }
+}

app/Jobs/Apps/InstallApp.php

@@ -2,45 +2,46 @@
 
 namespace App\Jobs\Apps;
 
+use App\Models\Database;
 use App\Models\Site;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Support\Arr;
 
 class InstallApp implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
-    public $site;
+    public Site $site;
     public $type;
     public $options;
 
-    /**
-     * Create a new job instance.
-     *
-     * @param Site $site
-     * @param string $type
-     * @param array $options
-     */
-    public function __construct(Site $site, $type = Site::PROJECT_WORDPRESS, array $options = [])
+    public function __construct(Site $site, string $type = Site::PROJECT_WORDPRESS, array $options = [])
     {
         $this->site = $site;
         $this->type = $type;
         $this->options = $options;
     }
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
     public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
+        $response = $this->getPloi()
+            ->server($this->site->server->ploi_id)
+            ->sites($this->site->ploi_id)
+            ->app()
+            ->install($this->type, $this->options);
 
-        $ploi->server($this->site->server->ploi_id)->sites($this->site->ploi_id)->app()->install($this->type, $this->options);
+        if (Arr::get($this->options, 'create_database', false)) {
+            $database = $this->site->databases()->create([
+                'name' => $response->database_name,
+            ]);
+
+            $database->status = Database::STATUS_ACTIVE;
+            $database->save();
+        }
     }
 }

app/Jobs/Apps/UninstallApp.php

@@ -3,7 +3,7 @@
 namespace App\Jobs\Apps;
 
 use App\Models\Site;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -12,9 +12,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class UninstallApp implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
-    public $site;
+    public Site $site;
 
     /**
      * Create a new job instance.
@@ -37,9 +37,11 @@ class UninstallApp implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploi->server($this->site->server->ploi_id)->sites($this->site->ploi_id)->app()->uninstall($this->site->project);
+        $this->getPloi()
+            ->server($this->site->server->ploi_id)
+            ->sites($this->site->ploi_id)
+            ->app()
+            ->uninstall($this->site->project);
 
         $this->site->project = null;
         $this->site->save();

app/Jobs/Certificates/CreateCertificate.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs\Certificates;
 
+use App\Traits\HasPloi;
 use App\Models\Certificate;
-use App\Services\Ploi\Ploi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -12,38 +12,44 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class CreateCertificate implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
-    public $certificate;
+    public Certificate $certificate;
 
-    /**
-     * Create a new job instance.
-     *
-     * @param Certificate $certificate
-     */
     public function __construct(Certificate $certificate)
     {
         $this->certificate = $certificate;
     }
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
     public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
+        if ($this->certificate->type === 'letsencrypt') {
+            $ploiCertificate = $this->getPloi()
+                ->server($this->certificate->server->ploi_id)
+                ->sites($this->certificate->site->ploi_id)
+                ->certificates()
+                ->create(
+                    $this->certificate->domain
+                );
 
-        $ploiCertificate = $ploi->server($this->certificate->server->ploi_id)
-            ->sites($this->certificate->site->ploi_id)
-            ->certificates()
-            ->create(
-                $this->certificate->domain
-            );
+            $this->certificate->ploi_id = $ploiCertificate->id;
+            $this->certificate->save();
+        }
 
-        $this->certificate->ploi_id = $ploiCertificate->id;
-        $this->certificate->save();
+        if ($this->certificate->type === 'custom') {
+            $ploiCertificate = $this->getPloi()
+                ->server($this->certificate->server->ploi_id)
+                ->sites($this->certificate->site->ploi_id)
+                ->certificates()
+                ->create(
+                    $this->certificate->certificate,
+                    $this->certificate->type,
+                    $this->certificate->private
+                );
+
+            $this->certificate->ploi_id = $ploiCertificate->id;
+            $this->certificate->save();
+        }
 
         // Lets fetch the status after 5 seconds
         dispatch(new FetchCertificateStatus($this->certificate))->delay(now()->addSeconds(5));

app/Jobs/Certificates/DeleteCertificate.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs\Certificates;
 
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -11,7 +11,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class DeleteCertificate implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $serverPloiId;
     public $sitePloiId;
@@ -42,9 +42,8 @@ class DeleteCertificate implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploi->server($this->serverPloiId)
+        $this->getPloi()
+            ->server($this->serverPloiId)
             ->sites($this->sitePloiId)
             ->certificates()
             ->delete($this->certificatePloiId);

app/Jobs/Certificates/FetchCertificateStatus.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs\Certificates;
 
+use App\Traits\HasPloi;
 use App\Models\Certificate;
-use App\Services\Ploi\Ploi;
 use Illuminate\Bus\Queueable;
 use App\Traits\JobHasThresholds;
 use Illuminate\Queue\SerializesModels;
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class FetchCertificateStatus implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds, HasPloi;
 
     public $certificate;
 
@@ -23,7 +23,7 @@ class FetchCertificateStatus implements ShouldQueue
      * @param Certificate $certificate
      * @param int $threshold
      */
-    public function __construct(Certificate $certificate, $threshold = 0)
+    public function __construct(Certificate $certificate, int $threshold = 0)
     {
         $this->certificate = $certificate;
         $this->setThreshold($threshold);
@@ -43,9 +43,8 @@ class FetchCertificateStatus implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploiCronjob = $ploi->server($this->certificate->server->ploi_id)
+        $ploiCronjob = $this->getPloi()
+            ->server($this->certificate->server->ploi_id)
             ->sites($this->certificate->site->ploi_id)
             ->certificates()
             ->get($this->certificate->ploi_id)

app/Jobs/Cronjobs/CreateCronjob.php

@@ -3,7 +3,7 @@
 namespace App\Jobs\Cronjobs;
 
 use App\Models\Cronjob;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -12,7 +12,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class CreateCronjob implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $cronjob;
 
@@ -35,13 +35,14 @@ class CreateCronjob implements ShouldQueue
     {
         $owner = $this->cronjob->site->users()->first();
 
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploiCronjob = $ploi->server($this->cronjob->server->ploi_id)->cronjobs()->create(
-            $this->cronjob->command,
-            $this->cronjob->frequency,
-            $owner->user_name
-        );
+        $ploiCronjob = $this->getPloi()
+            ->server($this->cronjob->server->ploi_id)
+            ->cronjobs()
+            ->create(
+                $this->cronjob->command,
+                $this->cronjob->frequency,
+                $owner->user_name
+            );
 
         $this->cronjob->ploi_id = $ploiCronjob->id;
         $this->cronjob->save();

app/Jobs/Cronjobs/DeleteCronjob.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs\Cronjobs;
 
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -11,7 +11,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class DeleteCronjob implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $serverPloiId;
     public $cronjobPloiId;
@@ -39,8 +39,9 @@ class DeleteCronjob implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploi->server($this->serverPloiId)->cronjobs()->delete($this->cronjobPloiId);
+        $this->getPloi()
+            ->server($this->serverPloiId)
+            ->cronjobs()
+            ->delete($this->cronjobPloiId);
     }
 }

app/Jobs/Cronjobs/FetchCronjobStatus.php

@@ -3,7 +3,7 @@
 namespace App\Jobs\Cronjobs;
 
 use App\Models\Cronjob;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use App\Traits\JobHasThresholds;
 use Illuminate\Queue\SerializesModels;
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class FetchCronjobStatus implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds, HasPloi;
 
     public $cronjob;
 
@@ -23,7 +23,7 @@ class FetchCronjobStatus implements ShouldQueue
      * @param Cronjob $cronjob
      * @param int $threshold
      */
-    public function __construct(Cronjob $cronjob, $threshold = 0)
+    public function __construct(Cronjob $cronjob, int $threshold = 0)
     {
         $this->cronjob = $cronjob;
         $this->setThreshold($threshold);
@@ -43,9 +43,11 @@ class FetchCronjobStatus implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploiCronjob = $ploi->server($this->cronjob->server->ploi_id)->cronjobs()->get($this->cronjob->ploi_id)->getData();
+        $ploiCronjob = $this->getPloi()
+            ->server($this->cronjob->server->ploi_id)
+            ->cronjobs()
+            ->get($this->cronjob->ploi_id)
+            ->getData();
 
         if ($ploiCronjob->status !== Cronjob::STATUS_ACTIVE) {
             $this->incrementThreshold();

app/Jobs/Databases/CreateDatabase.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs\Databases;
 
+use App\Traits\HasPloi;
 use App\Models\Database;
-use App\Services\Ploi\Ploi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -12,7 +12,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class CreateDatabase implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $database;
     public $password;
@@ -38,9 +38,10 @@ class CreateDatabase implements ShouldQueue
     {
         $databaseUser = $this->database->users()->first();
 
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploiDatabase = $ploi->server($this->database->server->ploi_id)->databases()->create($this->database->name, $databaseUser->name, $this->password);
+        $ploiDatabase = $this->getPloi()
+            ->server($this->database->server->ploi_id)
+            ->databases()
+            ->create($this->database->name, $databaseUser->name, $this->password);
 
         $this->database->ploi_id = $ploiDatabase->id;
         $this->database->save();

app/Jobs/Databases/DeleteDatabase.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs\Databases;
 
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -11,7 +11,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class DeleteDatabase implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $serverPloiId;
     public $databasePloiId;
@@ -40,8 +40,6 @@ class DeleteDatabase implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploi->server($this->serverPloiId)->databases()->delete($this->databasePloiId);
+        $this->getPloi()->server($this->serverPloiId)->databases()->delete($this->databasePloiId);
     }
 }

app/Jobs/Databases/FetchDatabaseStatus.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs\Databases;
 
+use App\Traits\HasPloi;
 use App\Models\Database;
-use App\Services\Ploi\Ploi;
 use Illuminate\Bus\Queueable;
 use App\Traits\JobHasThresholds;
 use Illuminate\Queue\SerializesModels;
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class FetchDatabaseStatus implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds, HasPloi;
 
     public $database;
 
@@ -23,7 +23,7 @@ class FetchDatabaseStatus implements ShouldQueue
      * @param Database $database
      * @param int $threshold
      */
-    public function __construct(Database $database, $threshold = 0)
+    public function __construct(Database $database, int $threshold = 0)
     {
         $this->database = $database;
         $this->setThreshold($threshold);
@@ -43,9 +43,11 @@ class FetchDatabaseStatus implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploiDatabase = $ploi->server($this->database->server->ploi_id)->databases()->get($this->database->ploi_id)->getData();
+        $ploiDatabase = $this->getPloi()
+            ->server($this->database->server->ploi_id)
+            ->databases()
+            ->get($this->database->ploi_id)
+            ->getData();
 
         if ($ploiDatabase->status !== Database::STATUS_ACTIVE) {
             $this->incrementThreshold();

app/Jobs/Redirects/CreateRedirect.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs\Redirects;
 
+use App\Traits\HasPloi;
 use App\Models\Redirect;
-use App\Services\Ploi\Ploi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -12,7 +12,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class CreateRedirect implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $redirect;
 
@@ -33,9 +33,7 @@ class CreateRedirect implements ShouldQueue
      */
     public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploiRedirect = $ploi
+        $ploiRedirect = $this->getPloi()
             ->server($this->redirect->server->ploi_id)
             ->sites($this->redirect->site->ploi_id)
             ->redirects()

app/Jobs/Redirects/DeleteRedirect.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs\Redirects;
 
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -11,7 +11,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class DeleteRedirect implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $serverPloiId;
     public $sitePloiId;
@@ -42,9 +42,8 @@ class DeleteRedirect implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploi->server($this->serverPloiId)
+        $this->getPloi()
+            ->server($this->serverPloiId)
             ->sites($this->sitePloiId)
             ->redirects()
             ->delete($this->redirectPloiId);

app/Jobs/Redirects/FetchRedirectStatus.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs\Redirects;
 
+use App\Traits\HasPloi;
 use App\Models\Redirect;
-use App\Services\Ploi\Ploi;
 use Illuminate\Bus\Queueable;
 use App\Traits\JobHasThresholds;
 use Illuminate\Queue\SerializesModels;
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class FetchRedirectStatus implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds, HasPloi;
 
     public $redirect;
 
@@ -23,7 +23,7 @@ class FetchRedirectStatus implements ShouldQueue
      * @param Redirect $redirect
      * @param int $threshold
      */
-    public function __construct(Redirect $redirect, $threshold = 0)
+    public function __construct(Redirect $redirect, int $threshold = 0)
     {
         $this->redirect = $redirect;
         $this->setThreshold($threshold);
@@ -43,9 +43,8 @@ class FetchRedirectStatus implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploiRedirect = $ploi->server($this->redirect->server->ploi_id)
+        $ploiRedirect = $this->getPloi()
+            ->server($this->redirect->server->ploi_id)
             ->sites($this->redirect->site->ploi_id)
             ->redirects()
             ->get($this->redirect->ploi_id)->getData();

app/Jobs/Servers/CreateServer.php

@@ -3,7 +3,7 @@
 namespace App\Jobs\Servers;
 
 use App\Models\Server;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -12,41 +12,31 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class CreateServer implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $server;
     public $tries = 1;
 
-    /**
-     * Create a new job instance.
-     *
-     * @param Server $server
-     */
     public function __construct(Server $server)
     {
         $this->server = $server;
     }
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
     public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploiServer = $ploi->server()->create(
+        $ploiServer = $this->getPloi()->server()->create(
             $this->server->name,
             $this->server->provider->ploi_id,
             $this->server->providerRegion->region_id,
             $this->server->providerPlan->plan_id,
+            'server',
+            $this->server->database_type
         );
 
         $this->server->ploi_id = $ploiServer->id;
         $this->server->save();
 
-        // Lets fetch the status after 5 minutes
+        // Let's fetch the status after 5 minutes
         dispatch(new FetchServerStatus($this->server))->delay(now()->addMinutes(5));
     }
 

app/Jobs/Servers/DeleteServer.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs\Servers;
 
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -11,7 +11,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class DeleteServer implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $serverPloiId;
 
@@ -32,8 +32,6 @@ class DeleteServer implements ShouldQueue
      */
     public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploi->server($this->serverPloiId)->delete();
+        $this->getPloi()->server($this->serverPloiId)->delete();
     }
 }

app/Jobs/Servers/FetchServerStatus.php

@@ -3,7 +3,7 @@
 namespace App\Jobs\Servers;
 
 use App\Models\Server;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use App\Traits\JobHasThresholds;
 use Illuminate\Queue\SerializesModels;
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class FetchServerStatus implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds, HasPloi;
 
     public $server;
 
@@ -43,9 +43,7 @@ class FetchServerStatus implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi;
-
-        $ploiServer = $ploi->server($this->server->ploi_id)->get()->getData();
+        $ploiServer = $this->getPloi()->server($this->server->ploi_id)->get()->getData();
 
         if ($ploiServer->status !== Server::STATUS_ACTIVE) {
             $this->incrementThreshold();

app/Jobs/Servers/SynchronizeServers.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Jobs\Servers;
-
-use App\Models\Server;
-use Illuminate\Bus\Queueable;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-
-class SynchronizeServers implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $ploi = new \App\Services\Ploi\Ploi(config('services.ploi.token'));
-
-        $servers = $ploi->server()->get()->getData();
-
-        foreach ($servers as $server) {
-            Server::firstOrCreate([
-                'ip' => $server->ip_address,
-            ], [
-                'name' => $server->name
-            ]);
-        }
-    }
-}

app/Jobs/Sites/ChangePhpVersion.php

@@ -3,7 +3,7 @@
 namespace App\Jobs\Sites;
 
 use App\Models\Site;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -12,7 +12,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class ChangePhpVersion implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $site;
     public $version;
@@ -36,9 +36,7 @@ class ChangePhpVersion implements ShouldQueue
      */
     public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploi->server($this->site->server->ploi_id)->sites($this->site->ploi_id)->phpVersion($this->version);
+        $this->getPloi()->server($this->site->server->ploi_id)->sites($this->site->ploi_id)->phpVersion($this->version);
 
         $this->site->php_version = $this->version;
         $this->site->save();

app/Jobs/Sites/CreateSite.php

@@ -3,7 +3,7 @@
 namespace App\Jobs\Sites;
 
 use App\Models\Site;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Support\Arr;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class CreateSite implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $site;
 
@@ -34,11 +34,9 @@ class CreateSite implements ShouldQueue
      */
     public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
-
         $systemUser = $this->site->getSystemUser();
 
-        $ploiSite = $ploi->server($this->site->server->ploi_id)->sites()->create(
+        $ploiSite = $this->getPloi()->server($this->site->server->ploi_id)->sites()->create(
             $this->site->domain,
             '/public',
             '/',

app/Jobs/Sites/DeleteSite.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs\Sites;
 
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -11,7 +11,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class DeleteSite implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, HasPloi;
 
     public $serverPloiId;
     public $sitePloiId;
@@ -34,8 +34,6 @@ class DeleteSite implements ShouldQueue
      */
     public function handle()
     {
-        $ploi = new Ploi(config('services.ploi.token'));
-
-        $ploi->server($this->serverPloiId)->sites()->delete($this->sitePloiId);
+        $this->getPloi()->server($this->serverPloiId)->sites()->delete($this->sitePloiId);
     }
 }

app/Jobs/Sites/FetchSiteStatus.php

@@ -3,7 +3,7 @@
 namespace App\Jobs\Sites;
 
 use App\Models\Site;
-use App\Services\Ploi\Ploi;
+use App\Traits\HasPloi;
 use Illuminate\Bus\Queueable;
 use App\Traits\JobHasThresholds;
 use Illuminate\Queue\SerializesModels;
@@ -13,7 +13,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class FetchSiteStatus implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, JobHasThresholds, HasPloi;
 
     public $site;
 
@@ -43,9 +43,7 @@ class FetchSiteStatus implements ShouldQueue
             return;
         }
 
-        $ploi = new Ploi;
-
-        $ploiSite = $ploi->server($this->site->server->ploi_id)->sites()->get($this->site->ploi_id)->getData();
+        $ploiSite = $this->getPloi()->server($this->site->server->ploi_id)->sites()->get($this->site->ploi_id)->getData();
 
         if ($ploiSite->status !== Site::STATUS_ACTIVE) {
             $this->incrementThreshold();

app/Mail/Admin/Server/AdminServerCreatedEmail.php

@@ -13,26 +13,15 @@ class AdminServerCreatedEmail extends Mailable implements ShouldQueue
 {
     use Queueable, SerializesModels;
 
-    public $user;
-    public $server;
+    public User $user;
+    public Server $server;
 
-    /**
-     * Create a new message instance.
-     *
-     * @param User $user
-     * @param Server $server
-     */
     public function __construct(User $user, Server $server)
     {
         $this->user = $user;
         $this->server = $server;
     }
 
-    /**
-     * Build the message.
-     *
-     * @return $this
-     */
     public function build()
     {
         return $this

app/Mail/Admin/Site/AdminSiteCreatedEmail.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Mail\Admin\Site;
+
+use App\Models\Server;
+use App\Models\Site;
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class AdminSiteCreatedEmail extends Mailable implements ShouldQueue
+{
+    use Queueable, SerializesModels;
+
+    public User $user;
+    public Server $server;
+    public Site $site;
+
+    public function __construct(User $user, Server $server, Site $site)
+    {
+        $this->user = $user;
+        $this->server = $server;
+        $this->site = $site;
+    }
+
+    public function build()
+    {
+        return $this
+            ->subject(__('A user has created a new site'))
+            ->markdown('emails.admin.site.new-site');
+    }
+}

app/Models/Certificate.php

@@ -18,6 +18,10 @@ class Certificate extends Model
 
     public $fillable = [
         'domain',
-        'type'
+        'type',
+        'certificate',
+        'private',
+        'ploi_id',
+        'status'
     ];
 }

app/Models/Package.php

@@ -15,6 +15,7 @@ class Package extends Model
     const CURRENCY_GBP = 'gbp';
     const CURRENCY_INR = 'inr';
     const CURRENCY_THB = 'thb';
+    const CURRENCY_BRL = 'brl';
 
     public $fillable = [
         'name',

app/Models/Provider.php

@@ -8,6 +8,11 @@ class Provider extends Model
 {
     protected $guarded = [];
 
+    protected $casts = [
+        'allowed_plans' => 'json',
+        'allowed_regions' => 'json',
+    ];
+
     public function getNameWithLabelAttribute()
     {
         $string = $this->name;

app/Models/Server.php

@@ -17,7 +17,8 @@ class Server extends Model
         'internal_ip',
         'ssh_port',
         'maximum_sites',
-        'available_php_versions'
+        'available_php_versions',
+        'database_type'
     ];
 
     protected $casts = [

app/Models/Site.php

@@ -2,9 +2,13 @@
 
 namespace App\Models;
 
+use App\Casts\SiteAlias;
 use DateTimeInterface;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * @property mixed|string domain
+ */
 class Site extends Model
 {
     const STATUS_BUSY = 'busy';
@@ -15,8 +19,15 @@ class Site extends Model
     const PROJECT_OCTOBERCMS = 'october-cms';
 
     public $fillable = [
+        'ploi_id',
         'domain',
-        'dns_id'
+        'dns_id',
+        'project',
+        'aliases'
+    ];
+
+    public $casts = [
+        'aliases' => SiteAlias::class,
     ];
 
     public function setDnsIdAttribute($value)
@@ -93,8 +104,28 @@ class Site extends Model
             ] + ($withPassword ? ['ftp_password' => $user->ftp_password] : []);
     }
 
+    public function addAlias($alias)
+    {
+        $aliases = $this->aliases;
+
+        $aliases[] = $alias;
+
+        $this->aliases = $aliases;
+        $this->save();
+    }
+
+    public function removeAlias($alias)
+    {
+        $this->aliases = array_diff($this->aliases, [$alias]);
+        $this->save();
+    }
+
     public static function booted()
     {
+        static::creating(function (self $site) {
+            $site->domain = strtolower($site->domain);
+        });
+
         static::created(function (self $site) {
             $site->systemUsers()->create();
         });

app/Services/Ploi/Ploi.php

@@ -25,7 +25,7 @@ class Ploi
 
     public function __construct(string $token = null, string $coreApiToken = null)
     {
-        $this->url = app()->isLocal() ? 'http://core-api.ploi.test/' : 'https://core-api.ploi.io/';
+        $this->url = config('services.ploi-api.url');
 
         if (!$token) {
             $token = config('services.ploi.token');

app/Services/Ploi/Resources/Alias.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Services\Ploi\Resources;
+
+class Alias extends Resource
+{
+    public function __construct(Server $server, Site $site)
+    {
+        parent::__construct($server->getPloi());
+
+        $this->setServer($server);
+        $this->setSite($site);
+
+        $this->buildEndpoint();
+    }
+
+    public function buildEndpoint(): self
+    {
+        $this->setEndpoint($this->getSite()->getEndpoint() . '/aliases');
+
+        return $this;
+    }
+
+    public function get()
+    {
+        return $this->getPloi()->makeAPICall($this->getEndpoint());
+    }
+
+    public function create(array $aliases)
+    {
+        $options = [
+            'body' => json_encode([
+                'aliases' => $aliases,
+            ]),
+        ];
+
+        return $this->getPloi()->makeAPICall($this->getEndpoint(), 'post', $options);
+    }
+
+    public function delete(string $alias)
+    {
+        return $this->getPloi()->makeAPICall($this->getEndpoint() . '/' . $alias , 'delete');
+    }
+}

app/Services/Ploi/Resources/App.php

@@ -66,7 +66,7 @@ class App extends Resource
         $this->setId($response->getJson()->data->id);
 
         // Return the data
-        return $response->getJson()->data;
+        return $response->getJson();
     }
 
     public function uninstall($type): bool

app/Services/Ploi/Resources/Certificate.php

@@ -43,7 +43,7 @@ class Certificate extends Resource
         return $this->getPloi()->makeAPICall($this->getEndpoint());
     }
 
-    public function create(string $certificate, string $type = 'letsencrypt'): stdClass
+    public function create(string $certificate, string $type = 'letsencrypt', string $private = null): stdClass
     {
         // Remove the id
         $this->setId(null);
@@ -51,8 +51,9 @@ class Certificate extends Resource
         // Set the options
         $options = [
             'body' => json_encode([
-                'certificate' => $certificate,
                 'type' => $type,
+                'certificate' => $certificate,
+                'private' => $private,
             ]),
         ];
 

app/Services/Ploi/Resources/Server.php

@@ -63,7 +63,11 @@ class Server extends Resource
         string $name,
         $provider,
         $region,
-        $plan
+        $plan,
+        $type = 'server',
+        $databaseType = 'mysql',
+        $webserverType = 'nginx',
+        $phpVersion = '7.4'
     ): stdClass {
 
         // Remove the id
@@ -76,10 +80,10 @@ class Server extends Resource
                 'plan' => $plan,
                 'region' => $region,
                 'credential' => $provider,
-                'type' => 'server',
-                'database_type' => 'mysql',
-                'webserver_type' => 'nginx',
-                'php_version' => '7.4'
+                'type' => $type,
+                'database_type' => $databaseType,
+                'webserver_type' => $webserverType,
+                'php_version' => $phpVersion
             ]),
         ];
 

app/Services/Ploi/Resources/Site.php

@@ -67,8 +67,7 @@ class Site extends Resource
         string $projectRoot = '/',
         string $systemUser = 'ploi',
         string $systemUserPassword = null
-    ): stdClass
-    {
+    ): stdClass {
 
         // Remove the id
         $this->setId(null);
@@ -99,11 +98,13 @@ class Site extends Resource
             }
 
             throw $exception;
+        } catch (\Exception $exception) {
+            info($exception->getMessage());
         }
 
         // TODO: Debugging purposes
-        if (!$response->getJson() || !$response->getJson()->data) {
-            info(json_encode($response->getJson()));
+        if (!$response->getJson() || !isset($response->getJson()->data)) {
+            throw new \Exception($response->getJson()->error ?? 'Unknown error has occured');
         }
 
         // Set the id of the site
@@ -203,4 +204,9 @@ class Site extends Resource
     {
         return new App($this->getServer(), $this, $id);
     }
+
+    public function aliases($id = null): Alias
+    {
+        return new Alias($this->getServer(), $this, $id);
+    }
 }

app/Services/Ploi/Resources/Synchronize.php

@@ -19,4 +19,9 @@ class Synchronize extends Resource
     {
         return $this->getPloi()->makeAPICall($this->getEndpoint() . '/servers');
     }
+
+    public function sites()
+    {
+        return $this->getPloi()->makeAPICall($this->getEndpoint() . '/sites');
+    }
 }

app/Traits/HasPloi.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Traits;
+
+use App\Services\Ploi\Ploi;
+
+trait HasPloi
+{
+    protected function getPloi()
+    {
+        return new Ploi(config('services.ploi.token'));
+    }
+}

composer.json

@@ -9,31 +9,31 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.0",
+        "php": "^8.0.2",
         "ext-json": "*",
-        "cloudflare/sdk": "^1.1",
-        "fideloper/proxy": "^4.2",
-        "fruitcake/laravel-cors": "^1.0",
-        "guzzlehttp/guzzle": "^6.2|^7.0.1",
-        "inertiajs/inertia-laravel": "^0.3.1",
-        "laravel/cashier": "^12.3",
-        "laravel/framework": "^8.4",
-        "laravel/horizon": "^5.0",
+        "cloudflare/sdk": "^1.3",
+        "guzzlehttp/guzzle": "^7.4.1",
+        "inertiajs/inertia-laravel": "^0.5.4",
+        "laravel/cashier": "^12.16",
+        "laravel/framework": "^9.0.2",
+        "laravel/horizon": "^5.8",
         "laravel/tinker": "^2.0",
         "laravel/ui": "^2.1|^3.3.0",
-        "league/glide": "^1.6",
         "pragmarx/google2fa-laravel": "^1.3",
         "predis/predis": "^1.1",
-        "tightenco/ziggy": "^0.9.4"
+        "symfony/http-client": "^6.0",
+        "symfony/mailgun-mailer": "^6.0",
+        "symfony/postmark-mailer": "^6.0",
+        "tightenco/ziggy": "^1.3"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.3",
-        "facade/ignition": "^2.3",
-        "friendsofphp/php-cs-fixer": "^2.16",
+        "spatie/laravel-ignition": "^1.0",
+        "friendsofphp/php-cs-fixer": "^3.1.0",
         "fzaninotto/faker": "^1.9.1",
         "laravel/dusk": "^6.15",
         "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^5.0",
+        "nunomaduro/collision": "^6.1",
         "phpunit/phpunit": "^9.5.4"
     },
     "config": {

config/core.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'pagination' => [
+        'per_page' => env('PAGINATION_PER_PAGE', 5)
+    ]
+];

config/services.php

@@ -33,5 +33,9 @@ return [
     'ploi' => [
         'token' => env('PLOI_TOKEN'),
         'core-token' => env('PLOI_CORE_TOKEN')
+    ],
+
+    'ploi-api' => [
+        'url' => env('PLOI_API_URL', 'https://core-api.ploi.io/')
     ]
 ];

config/view.php

@@ -15,6 +15,7 @@ return [
 
     'paths' => [
         resource_path('views'),
+        storage_path('views'),
     ],
 
     /*

database/migrations/2021_07_12_100447_add_price_yearly_to_packages_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class AddPriceYearlyToPackagesTable extends Migration
 {

database/migrations/2021_07_29_073822_add_columns_to_certificates_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddColumnsToCertificatesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('certificates', function (Blueprint $table) {
+            $table->after('domain', function ($table) {
+                $table->longText('certificate')->nullable();
+                $table->longText('private')->nullable();
+            });
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('certificates', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/migrations/2021_08_12_091308_add_allowed_regions_and_plans_to_providers_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAllowedRegionsAndPlansToProvidersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('providers', function (Blueprint $table) {
+            $table->json('allowed_plans')->nullable()->after('name');
+            $table->json('allowed_regions')->nullable()->after('allowed_plans');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('providers', function (Blueprint $table) {
+            $table->dropColumn('allowed_plans', 'allowed_regions');
+        });
+    }
+}

database/migrations/2022_01_21_122337_add_columns_to_servers_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddColumnsToServersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->after('available_php_versions', function (Blueprint $table) {
+                $table->string('type')->default('server');
+                $table->string('database_type')->default('mysql');
+            });
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropColumn('type', 'database_type');
+        });
+    }
+}

database/migrations/2022_04_01_084428_add_aliases_to_sites_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('sites', function (Blueprint $table) {
+            $table->json('aliases')->nullable()->after('php_version');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('sites', function (Blueprint $table) {
+            $table->dropColumn('aliases');
+        });
+    }
+};

package.json

@@ -10,29 +10,32 @@
     },
     "devDependencies": {
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@inertiajs/inertia": "^0.9.2",
-        "@inertiajs/inertia-vue": "^0.6.2",
-        "@inertiajs/progress": "^0.2.5",
-        "@tailwindcss/forms": "^0.3.3",
-        "@tailwindcss/typography": "^0.4.1",
-        "autoprefixer": "^10.2.5",
+        "@inertiajs/inertia": "^0.10.0",
+        "@inertiajs/inertia-vue": "^0.7.1",
+        "@inertiajs/progress": "^0.2.6",
+        "@tailwindcss/forms": "^0.4.0",
+        "@tailwindcss/typography": "^0.5.0",
+        "autoprefixer": "^10.4.0",
         "axios": "^0.21.1",
         "balloon-css": "^1.2.0",
         "cross-env": "^7.0.3",
-        "laravel-mix": "^6.0.25",
+        "laravel-mix": "^6.0.41",
         "lodash": "^4.17.15",
         "portal-vue": "^2.1.7",
-        "postcss": "^8.2.13",
+        "postcss": "^8.4.5",
         "resolve-url-loader": "^3.1.0",
         "sass": "^1.15.2",
         "sass-loader": "^8.0.0",
-        "tailwindcss": "^2.2.4",
+        "tailwindcss": "^3.0.7",
         "v-click-outside": "^3.1.2",
         "vue": "^2.6.11",
         "vue-clipboard2": "^0.3.1",
-        "vue-loader": "^15.9.6",
+        "vue-loader": "^15.9.8",
         "vue-meta": "^2.4.0",
         "vue-template-compiler": "^2.6.11",
         "vuex": "^3.6.2"
+    },
+    "dependencies": {
+        "vue-simplemde": "^2.0.0"
     }
 }