diff --git a/app/SiteTypes/LoadBalancer.php b/app/SiteTypes/LoadBalancer.php index 379e45154..6eeb6627b 100755 --- a/app/SiteTypes/LoadBalancer.php +++ b/app/SiteTypes/LoadBalancer.php @@ -82,13 +82,14 @@ public function vhost(string $webserver): string|View if ($webserver === 'caddy') { return view('ssh.services.webserver.caddy.vhost', [ - 'main' => implode("\n", [ + 'site' => $this->site, + 'main' => [ view('ssh.services.webserver.caddy.vhost-blocks.force-ssl', ['site' => $this->site]), view('ssh.services.webserver.caddy.vhost-blocks.port', ['site' => $this->site]), view('ssh.services.webserver.caddy.vhost-blocks.core', ['site' => $this->site]), view('ssh.services.webserver.caddy.vhost-blocks.load-balancer', ['site' => $this->site]), view('ssh.services.webserver.caddy.vhost-blocks.redirects', ['site' => $this->site]), - ]), + ], ]); } diff --git a/app/SiteTypes/NodeJS.php b/app/SiteTypes/NodeJS.php index b8059c214..23761350f 100755 --- a/app/SiteTypes/NodeJS.php +++ b/app/SiteTypes/NodeJS.php @@ -153,6 +153,7 @@ public function vhost(string $webserver): string|View if ($webserver === 'caddy') { return view('ssh.services.webserver.caddy.vhost', [ + 'site' => $this->site, 'main' => [ view('ssh.services.webserver.caddy.vhost-blocks.force-ssl', ['site' => $this->site]), view('ssh.services.webserver.caddy.vhost-blocks.port', ['site' => $this->site]), diff --git a/app/SiteTypes/PHPSite.php b/app/SiteTypes/PHPSite.php index 8e2166a95..768d042c9 100755 --- a/app/SiteTypes/PHPSite.php +++ b/app/SiteTypes/PHPSite.php @@ -134,6 +134,7 @@ public function vhost(string $webserver): string|View if ($webserver === 'caddy') { return view('ssh.services.webserver.caddy.vhost', [ + 'site' => $this->site, 'main' => [ view('ssh.services.webserver.caddy.vhost-blocks.force-ssl', ['site' => $this->site]), view('ssh.services.webserver.caddy.vhost-blocks.port', ['site' => $this->site]),