Skip to content

Commit bf7f01d

Browse files
Fix undefined variable $site in Caddy vhost view (#967)
- Pass `$site` variable to `ssh.services.webserver.caddy.vhost` view in `PHPSite`, `NodeJS`, and `LoadBalancer` site types. - Fix `LoadBalancer` Caddy vhost rendering to pass `main` blocks as an array instead of a string, matching the view's `@foreach` loop. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
1 parent 6ad96d5 commit bf7f01d

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

app/SiteTypes/LoadBalancer.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,14 @@ public function vhost(string $webserver): string|View
8282

8383
if ($webserver === 'caddy') {
8484
return view('ssh.services.webserver.caddy.vhost', [
85-
'main' => implode("\n", [
85+
'site' => $this->site,
86+
'main' => [
8687
view('ssh.services.webserver.caddy.vhost-blocks.force-ssl', ['site' => $this->site]),
8788
view('ssh.services.webserver.caddy.vhost-blocks.port', ['site' => $this->site]),
8889
view('ssh.services.webserver.caddy.vhost-blocks.core', ['site' => $this->site]),
8990
view('ssh.services.webserver.caddy.vhost-blocks.load-balancer', ['site' => $this->site]),
9091
view('ssh.services.webserver.caddy.vhost-blocks.redirects', ['site' => $this->site]),
91-
]),
92+
],
9293
]);
9394
}
9495

app/SiteTypes/NodeJS.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ public function vhost(string $webserver): string|View
153153

154154
if ($webserver === 'caddy') {
155155
return view('ssh.services.webserver.caddy.vhost', [
156+
'site' => $this->site,
156157
'main' => [
157158
view('ssh.services.webserver.caddy.vhost-blocks.force-ssl', ['site' => $this->site]),
158159
view('ssh.services.webserver.caddy.vhost-blocks.port', ['site' => $this->site]),

app/SiteTypes/PHPSite.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ public function vhost(string $webserver): string|View
134134

135135
if ($webserver === 'caddy') {
136136
return view('ssh.services.webserver.caddy.vhost', [
137+
'site' => $this->site,
137138
'main' => [
138139
view('ssh.services.webserver.caddy.vhost-blocks.force-ssl', ['site' => $this->site]),
139140
view('ssh.services.webserver.caddy.vhost-blocks.port', ['site' => $this->site]),

0 commit comments

Comments
 (0)