direct-online/vito
2
0
Fork 0
mirror of https://github.com/vitodeploy/vito.git synced 2025-04-19 09:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix custom vhost update (#164)

Browse Source
This commit is contained in:
Saeed Vaziry 2024-04-13 23:47:52 +02:00 committed by GitHub
parent f03a029e36
commit aaef73d89d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/SiteSettingController.php
View File

@ -7,6 +7,7 @@
use App\Helpers\HtmxResponse; use App\Helpers\HtmxResponse;
use App\Models\Server; use App\Models\Server;
use App\Models\Site; use App\Models\Site;
use App\SSH\Services\Webserver\Webserver;
use Illuminate\Contracts\View\View; use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse; use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@ -25,7 +26,10 @@ public function index(Server $server, Site $site): View
public function getVhost(Server $server, Site $site): RedirectResponse 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 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 { 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!'); Toast::success('VHost updated successfully!');
} catch (Throwable $e) { } catch (Throwable $e) {

2
app/SSH/Services/Webserver/Nginx.php
View File

@ -70,7 +70,7 @@ public function updateVHost(Site $site, bool $noSSL = false, ?string $vhost = nu
$this->getScript('nginx/update-vhost.sh', [ $this->getScript('nginx/update-vhost.sh', [
'domain' => $site->domain, 'domain' => $site->domain,
'path' => $site->path, 'path' => $site->path,
'vhost' => $this->generateVhost($site, $noSSL), 'vhost' => $vhost ?? $this->generateVhost($site, $noSSL),
]), ]),
'update-vhost', 'update-vhost',
$site->id $site->id