homelab/infra
1
0
Fork 0
Code Issues Pull requests 7 Projects Releases Packages Wiki Activity Actions

caddy: recover the familie.gierz.eu vhosts on main #4

Open
erwin wants to merge 0 commits from erwin/familie-caddy-recover into main
pull from: erwin/familie-caddy-recover
merge into: homelab:main
Conversation 0 Commits - Files changed -
erwin commented 2026-07-08 20:40:10 +00:00
First-time contributor
Copy link

Recovers the familie vhosts amputated by the post-6a28 converge (full story in the commit body). Cherry-pick of the familie hunks of 7a646fc only — the coupled gateway connection-model change stays out, to be decided with the CD runner design.

Diff-gate rehearsal done by hand today: rendered-from-this-branch vs deployed on edge+gateway shows exactly these blocks as pure additions, zero removals, now that main carries the GTS fixes.

After merge: converge edge+gateway (supervised), then verify https://familie.gierz.eu/apfelbaum returns 200.

Recovers the familie vhosts amputated by the post-6a28 converge (full story in the commit body). Cherry-pick of the familie hunks of 7a646fc only — the coupled gateway connection-model change stays out, to be decided with the CD runner design. Diff-gate rehearsal done by hand today: rendered-from-this-branch vs deployed on edge+gateway shows exactly these blocks as pure additions, zero removals, now that main carries the GTS fixes. After merge: converge edge+gateway (supervised), then verify https://familie.gierz.eu/apfelbaum returns 200.
The familie routing (7a646fc, branch erwin/familie-routing) was deployed
live 2026-06-28 but never merged; a later converge from main re-rendered
the Caddyfiles and silently dropped the vhosts. Since then edge aborts
the TLS handshake for familie.gierz.eu (alert internal error - no site
block for the SNI).

Cherry-pick of the familie hunks of 7a646fc only:
- caddy(edge): familie.gierz.eu terminates TLS, proxies plain HTTP over
  WG to the gateway.
- caddy(gateway): http://familie.gierz.eu serves /var/www/familie.gierz.eu.
- host_vars: add familie.gierz.eu to landing_sites so landing_page
  deploys the content.

The inventory change coupled into 7a646fc (gierz-gateway default
flipped to WG-via-edge) is deliberately left out - the connection model
gets decided on its own when the in-LAN CD runner is designed.

Signed-off-by: erwin <erwin@gierz.eu>
Co-Authored-By: LLM <noreply@invalid>
Claude-Session: https://claude.ai/code/session_01UVBwAUedQi9YJ6S9UJomMS
This branch is already included in the target branch. There is nothing to merge.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin erwin/familie-caddy-recover:erwin/familie-caddy-recover
git switch erwin/familie-caddy-recover

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff erwin/familie-caddy-recover
git switch erwin/familie-caddy-recover
git rebase main
git switch main
git merge --ff-only erwin/familie-caddy-recover
git switch erwin/familie-caddy-recover
git rebase main
git switch main
git merge --no-ff erwin/familie-caddy-recover
git switch main
git merge --squash erwin/familie-caddy-recover
git switch main
git merge --ff-only erwin/familie-caddy-recover
git switch main
git merge erwin/familie-caddy-recover
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
homelab/infra!4
No description provided.