From aaef73d89dd2d4765c7b431e6b4af0268c2f4786 Mon Sep 17 00:00:00 2001
From: Saeed Vaziry <61919774+saeedvaziry@users.noreply.github.com>
Date: Sat, 13 Apr 2024 23:47:52 +0200
Subject: [PATCH] fix custom vhost update (#164)

---
 app/Http/Controllers/SiteSettingController.php | 10 ++++++++--
 app/SSH/Services/Webserver/Nginx.php           |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/SiteSettingController.php b/app/Http/Controllers/SiteSettingController.php
index 9a037a9..b45170e 100644
--- a/app/Http/Controllers/SiteSettingController.php
+++ b/app/Http/Controllers/SiteSettingController.php
@@ -7,6 +7,7 @@
 use App\Helpers\HtmxResponse;
 use App\Models\Server;
 use App\Models\Site;
+use App\SSH\Services\Webserver\Webserver;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -25,7 +26,10 @@ public function index(Server $server, Site $site): View
 
     public function getVhost(Server $server, Site $site): RedirectResponse
     {
-        return back()->with('vhost', $server->webserver()->handler()->getVHost($site));
+        /** @var Webserver $handler */
+        $handler = $server->webserver()->handler();
+
+        return back()->with('vhost', $handler->getVHost($site));
     }
 
     public function updateVhost(Server $server, Site $site, Request $request): RedirectResponse
@@ -35,7 +39,9 @@ public function updateVhost(Server $server, Site $site, Request $request): Redir
         ]);
 
         try {
-            $server->webserver()->handler()->updateVHost($site, false, $request->input('vhost'));
+            /** @var Webserver $handler */
+            $handler = $server->webserver()->handler();
+            $handler->updateVHost($site, false, $request->input('vhost'));
 
             Toast::success('VHost updated successfully!');
         } catch (Throwable $e) {
diff --git a/app/SSH/Services/Webserver/Nginx.php b/app/SSH/Services/Webserver/Nginx.php
index 8e39d3e..2efb9b8 100755
--- a/app/SSH/Services/Webserver/Nginx.php
+++ b/app/SSH/Services/Webserver/Nginx.php
@@ -70,7 +70,7 @@ public function updateVHost(Site $site, bool $noSSL = false, ?string $vhost = nu
             $this->getScript('nginx/update-vhost.sh', [
                 'domain' => $site->domain,
                 'path' => $site->path,
-                'vhost' => $this->generateVhost($site, $noSSL),
+                'vhost' => $vhost ?? $this->generateVhost($site, $noSSL),
             ]),
             'update-vhost',
             $site->id