Erich Blume
272ea1e767
## Summary - Upgrade Caddy from v2.10.2 to v2.11.2 (7 CVE fixes across v2.11.1 and v2.11.2) - Create `mirrors/caddy-l4` forge mirror for Layer 4 plugin - Migrate all `~/code/3rd` clones on indri from `localhost:3001` to HTTPS `forge.ops.eblu.me/mirrors/` remotes - Remove stale clones (`apple-silicon-detector`, `whisper.cpp`) - Update caddy docs and service-versions tracking ## CVEs Fixed - CVE-2026-27585 through CVE-2026-27590 (path/host bypass, TLS fail-open, FastCGI issues) - Forward auth identity injection (privilege escalation) - `vars_regexp` placeholder secret exposure - Built on Go 1.26.1 (patches Go-level CVEs) ## What was done on indri (not in repo) - `xcaddy build` with Gandi DNS + Layer 4 plugins → `~/code/3rd/caddy/bin/caddy` now v2.11.2 - Remotes updated: caddy, forgejo-runner, zot → `https://forge.ops.eblu.me/mirrors/*.git` - Deleted: `~/code/3rd/apple-silicon-detector`, `~/code/3rd/whisper.cpp` ## Deployment and Testing - [x] Ansible dry-run passed (`--tags caddy --check --diff`) - [ ] Restart caddy LaunchAgent to pick up the new binary - [ ] Verify all proxied services respond via `*.ops.eblu.me` - [ ] Run `mise run services-check` Reviewed-on: #294
108 lines
3.6 KiB
YAML
108 lines
3.6 KiB
YAML
---
|
|
# Caddy reverse proxy configuration
|
|
# Caddy is built from ~/code/3rd/caddy with Gandi DNS and Layer 4 plugins
|
|
|
|
caddy_repo_dir: /Users/erichblume/code/3rd/caddy
|
|
caddy_binary: "{{ caddy_repo_dir }}/bin/caddy"
|
|
caddy_config_dir: /Users/erichblume/.config/caddy
|
|
caddy_data_dir: /Users/erichblume/.local/share/caddy
|
|
caddy_log_dir: /Users/erichblume/Library/Logs
|
|
|
|
# Gandi API token file (written by ansible, chmod 0600)
|
|
# Caddy reads this file for ACME DNS-01 challenges
|
|
caddy_gandi_token_file: /Users/erichblume/.config/caddy/gandi-token
|
|
|
|
# Domain configuration
|
|
caddy_domain: ops.eblu.me
|
|
|
|
# HTTPS port (443 is standard)
|
|
caddy_https_port: 443
|
|
|
|
# Services to proxy
|
|
# Format: { name: "service", host: "hostname", backend: "url" }
|
|
caddy_services:
|
|
# Indri-local services
|
|
- name: forge
|
|
host: "forge.{{ caddy_domain }}"
|
|
backend: "http://localhost:3001"
|
|
- name: registry
|
|
host: "registry.{{ caddy_domain }}"
|
|
backend: "http://localhost:5050"
|
|
- name: jellyfin
|
|
host: "jellyfin.{{ caddy_domain }}"
|
|
backend: "http://localhost:8096"
|
|
|
|
# K8s services (via Tailscale Ingress)
|
|
# Caddy proxies to existing Tailscale endpoints - traffic stays local
|
|
- name: grafana
|
|
host: "grafana.{{ caddy_domain }}"
|
|
backend: "https://grafana.tail8d86e.ts.net"
|
|
- name: argocd
|
|
host: "argocd.{{ caddy_domain }}"
|
|
backend: "https://argocd.tail8d86e.ts.net"
|
|
- name: prometheus
|
|
host: "prometheus.{{ caddy_domain }}"
|
|
backend: "https://prometheus.tail8d86e.ts.net"
|
|
- name: loki
|
|
host: "loki.{{ caddy_domain }}"
|
|
backend: "https://loki.tail8d86e.ts.net"
|
|
- name: miniflux
|
|
host: "feed.{{ caddy_domain }}"
|
|
backend: "https://feed.tail8d86e.ts.net"
|
|
- name: devpi
|
|
host: "pypi.{{ caddy_domain }}"
|
|
backend: "https://pypi.tail8d86e.ts.net"
|
|
- name: kiwix
|
|
host: "kiwix.{{ caddy_domain }}"
|
|
backend: "https://kiwix.tail8d86e.ts.net"
|
|
- name: torrent
|
|
host: "torrent.{{ caddy_domain }}"
|
|
backend: "https://torrent.tail8d86e.ts.net"
|
|
- name: teslamate
|
|
host: "tesla.{{ caddy_domain }}"
|
|
backend: "https://tesla.tail8d86e.ts.net"
|
|
- name: immich
|
|
host: "photos.{{ caddy_domain }}"
|
|
backend: "https://photos.tail8d86e.ts.net"
|
|
- name: navidrome
|
|
host: "dj.{{ caddy_domain }}"
|
|
backend: "https://dj.tail8d86e.ts.net"
|
|
- name: homepage
|
|
host: "go.{{ caddy_domain }}"
|
|
backend: "https://go.tail8d86e.ts.net"
|
|
- name: docs
|
|
host: "docs.{{ caddy_domain }}"
|
|
backend: "https://docs.tail8d86e.ts.net"
|
|
- name: cv
|
|
host: "cv.{{ caddy_domain }}"
|
|
backend: "https://cv.tail8d86e.ts.net"
|
|
- name: nvr
|
|
host: "nvr.{{ caddy_domain }}"
|
|
backend: "https://nvr.tail8d86e.ts.net"
|
|
- name: authentik
|
|
host: "authentik.{{ caddy_domain }}"
|
|
backend: "https://authentik.tail8d86e.ts.net"
|
|
- name: ntfy
|
|
host: "ntfy.{{ caddy_domain }}"
|
|
backend: "https://ntfy.tail8d86e.ts.net"
|
|
- name: jobsync
|
|
host: "jobsync.{{ caddy_domain }}"
|
|
backend: "https://jobsync.tail8d86e.ts.net"
|
|
- name: ollama
|
|
host: "ollama.{{ caddy_domain }}"
|
|
backend: "https://ollama.tail8d86e.ts.net"
|
|
- name: sifaka
|
|
host: "nas.{{ caddy_domain }}"
|
|
backend: "http://sifaka:5000"
|
|
|
|
# Layer 4 (TCP) services
|
|
# Format: { port: external_port, backend: "host:port" }
|
|
caddy_tcp_services:
|
|
- port: 2222
|
|
backend: "localhost:2200" # Forgejo SSH
|
|
- port: 5432
|
|
backend: "pg.tail8d86e.ts.net:5432" # PostgreSQL
|
|
- port: "{{ sifaka_node_exporter_port }}"
|
|
backend: "sifaka:{{ sifaka_node_exporter_port }}" # Sifaka node_exporter
|
|
- port: "{{ sifaka_smartctl_exporter_port }}"
|
|
backend: "sifaka:{{ sifaka_smartctl_exporter_port }}" # Sifaka smartctl_exporter
|