deploy Wordpress sites via VitoDeploy (#83)

vitodeploy · Jan 1, 2024 · 4cda14f · 4cda14f
1 parent 5e6d338
commit 4cda14f
Show file tree

Hide file tree

Showing 31 changed files with 443 additions and 292 deletions.
diff --git a/app/Actions/Site/CreateSite.php b/app/Actions/Site/CreateSite.php
@@ -49,11 +49,6 @@ public function create(Server $server, array $input): Site
                 ]);
             }
 
-            // detect php version
-            if ($site->type()->language() === 'php') {
-                $site->php_version = $input['php_version'];
-            }
-
             // validate type
             $this->validateType($site, $input);
 

diff --git a/app/Contracts/SiteType.php b/app/Contracts/SiteType.php
@@ -6,6 +6,8 @@ interface SiteType
 {
     public function language(): string;
 
+    public function supportedFeatures(): array;
+
     public function createValidationRules(array $input): array;
 
     public function createFields(array $input): array;

diff --git a/app/Enums/SiteFeature.php b/app/Enums/SiteFeature.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Enums;
+
+use BenSampo\Enum\Enum;
+
+final class SiteFeature extends Enum
+{
+    const DEPLOYMENT = 'deployment';
+
+    const ENV = 'env';
+
+    const SSL = 'ssl';
+
+    const QUEUES = 'queues';
+}
diff --git a/app/Http/Livewire/Sites/CreateSite.php b/app/Http/Livewire/Sites/CreateSite.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Livewire\Sites;
 
-use App\Enums\SiteType;
 use App\Exceptions\SourceControlIsNotConnected;
 use App\Models\Server;
 use App\Models\SourceControl;
@@ -16,23 +15,12 @@ class CreateSite extends Component
 
     public Server $server;
 
-    public string $type = SiteType::LARAVEL;
-
-    public string $domain;
-
-    public string $alias;
-
-    public string $php_version = '';
-
-    public string $web_directory = 'public';
-
-    public string $source_control = '';
-
-    public string $repository;
-
-    public string $branch;
-
-    public bool $composer;
+    public array $inputs = [
+        'type' => '',
+        'web_directory' => 'public',
+        'source_control' => '',
+        'php_version' => '',
+    ];
 
     /**
      * @throws SourceControlIsNotConnected
@@ -41,7 +29,7 @@ public function create(): void
     {
         $site = app(\App\Actions\Site\CreateSite::class)->create(
             $this->server,
-            $this->all()
+            $this->inputs
         );
 
         $this->redirect(route('servers.sites.show', [

diff --git a/app/Jobs/Site/InstallWordpress.php b/app/Jobs/Site/InstallWordpress.php
@@ -52,7 +52,7 @@ public function handle(): void
             $this->site->id
         );
 
-        if (! Str::contains($result, 'Wordpress installed!')) {
+        if (! Str::contains($result, 'Success')) {
             throw new FailedToInstallWordpress($result);
         }
     }

diff --git a/app/Models/Database.php b/app/Models/Database.php
@@ -57,19 +57,19 @@ public function server(): BelongsTo
     /**
      * create database on server
      */
-    public function createOnServer(): void
+    public function createOnServer(string $queue = 'ssh'): void
     {
-        dispatch(new CreateOnServer($this))->onConnection('ssh');
+        dispatch(new CreateOnServer($this))->onConnection($queue);
     }
 
     /**
      * delete database from server
      */
-    public function deleteFromServer(): void
+    public function deleteFromServer(string $queue = 'ssh'): void
     {
         $this->status = DatabaseStatus::DELETING;
         $this->save();
-        dispatch(new DeleteFromServer($this))->onConnection('ssh');
+        dispatch(new DeleteFromServer($this))->onConnection($queue);
     }
 
     public function backups(): HasMany

diff --git a/app/Models/DatabaseUser.php b/app/Models/DatabaseUser.php
@@ -54,17 +54,17 @@ public function scopeHasDatabase(Builder $query, string $databaseName): Builder
         return $query->where('databases', 'like', "%\"$databaseName\"%");
     }
 
-    public function createOnServer(): void
+    public function createOnServer(string $queue = 'ssh'): void
     {
-        dispatch(new CreateOnServer($this))->onConnection('ssh');
+        dispatch(new CreateOnServer($this))->onConnection($queue);
     }
 
-    public function deleteFromServer(): void
+    public function deleteFromServer(string $queue = 'ssh'): void
     {
         $this->status = DatabaseStatus::DELETING;
         $this->save();
 
-        dispatch(new DeleteFromServer($this))->onConnection('ssh');
+        dispatch(new DeleteFromServer($this))->onConnection($queue);
     }
 
     public function linkNewDatabase(string $name): void
@@ -79,14 +79,14 @@ public function linkNewDatabase(string $name): void
         }
     }
 
-    public function linkUser(): void
+    public function linkUser(string $queue = 'ssh'): void
     {
-        dispatch(new LinkUser($this))->onConnection('ssh');
+        dispatch(new LinkUser($this))->onConnection($queue);
     }
 
-    public function unlinkUser(): void
+    public function unlinkUser(string $queue = 'ssh'): void
     {
-        dispatch(new UnlinkUser($this))->onConnection('ssh');
+        dispatch(new UnlinkUser($this))->onConnection($queue);
     }
 
     public function getFullUserAttribute(): string

diff --git a/app/Models/Site.php b/app/Models/Site.php
@@ -6,6 +6,7 @@
 use App\Enums\DeploymentStatus;
 use App\Enums\SiteStatus;
 use App\Enums\SslStatus;
+use App\Events\Broadcast;
 use App\Exceptions\SourceControlIsNotConnected;
 use App\Jobs\Site\ChangePHPVersion;
 use App\Jobs\Site\Deploy;
@@ -18,6 +19,7 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 use Throwable;
 
@@ -392,4 +394,49 @@ public function getSshKeyNameAttribute(): string
     {
         return str('site_'.$this->id)->toString();
     }
+
+    public function installationFinished(): void
+    {
+        $this->update([
+            'status' => SiteStatus::READY,
+            'progress' => 100,
+        ]);
+        event(
+            new Broadcast('install-site-finished', [
+                'site' => $this,
+            ])
+        );
+        /** @todo notify */
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function installationFailed(Throwable $e): void
+    {
+        $this->update([
+            'status' => SiteStatus::INSTALLATION_FAILED,
+        ]);
+        event(
+            new Broadcast('install-site-failed', [
+                'site' => $this,
+            ])
+        );
+        /** @todo notify */
+        Log::error('install-site-error', [
+            'error' => (string) $e,
+        ]);
+
+        throw $e;
+    }
+
+    public function hasFeature(string $feature): bool
+    {
+        return in_array($feature, $this->type()->supportedFeatures());
+    }
+
+    public function isReady(): bool
+    {
+        return $this->status === SiteStatus::READY;
+    }
 }
diff --git a/app/SiteTypes/PHPSite.php b/app/SiteTypes/PHPSite.php
@@ -2,14 +2,12 @@
 
 namespace App\SiteTypes;
 
-use App\Enums\SiteStatus;
-use App\Events\Broadcast;
+use App\Enums\SiteFeature;
 use App\Jobs\Site\CloneRepository;
 use App\Jobs\Site\ComposerInstall;
 use App\Jobs\Site\CreateVHost;
 use App\Jobs\Site\DeployKey;
 use Illuminate\Support\Facades\Bus;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Rule;
 use Throwable;
 
@@ -20,12 +18,22 @@ public function language(): string
         return 'php';
     }
 
+    public function supportedFeatures(): array
+    {
+        return [
+            SiteFeature::DEPLOYMENT,
+            SiteFeature::ENV,
+            SiteFeature::SSL,
+            SiteFeature::QUEUES,
+        ];
+    }
+
     public function createValidationRules(array $input): array
     {
         return [
             'php_version' => [
                 'required',
-                'in:'.implode(',', $this->site->server->installedPHPVersions()),
+                Rule::in($this->site->server->installedPHPVersions()),
             ],
             'source_control' => [
                 'required',
@@ -44,16 +52,17 @@ public function createFields(array $input): array
     {
         return [
             'web_directory' => $input['web_directory'] ?? '',
-            'source_control_id' => $input['source_control'] ?? '',
-            'repository' => $input['repository'] ?? '',
-            'branch' => $input['branch'] ?? '',
+            'source_control_id' => $input['source_control'],
+            'repository' => $input['repository'],
+            'branch' => $input['branch'],
         ];
     }
 
     public function data(array $input): array
     {
         return [
             'composer' => (bool) $input['composer'],
+            'php_version' => $input['php_version'],
         ];
     }
 
@@ -76,33 +85,12 @@ function () {
         }
 
         $chain[] = function () {
-            $this->site->update([
-                'status' => SiteStatus::READY,
-                'progress' => 100,
-            ]);
-            event(
-                new Broadcast('install-site-finished', [
-                    'site' => $this->site,
-                ])
-            );
-            /** @todo notify */
+            $this->site->installationFinished();
         };
 
         Bus::chain($chain)
             ->catch(function (Throwable $e) {
-                $this->site->update([
-                    'status' => SiteStatus::INSTALLATION_FAILED,
-                ]);
-                event(
-                    new Broadcast('install-site-failed', [
-                        'site' => $this->site,
-                    ])
-                );
-                /** @todo notify */
-                Log::error('install-site-error', [
-                    'error' => (string) $e,
-                ]);
-                throw $e;
+                $this->site->installationFailed($e);
             })
             ->onConnection('ssh-long')
             ->dispatch();