diff --git a/.env.example b/.env.example index 8e90fc8..db3f037 100644 --- a/.env.example +++ b/.env.example @@ -12,9 +12,11 @@ SSH_KEY_PATH=~/.ssh # ── LAN access from the container (host-OS-agnostic) ───────────────── # On VM-backed hosts (macOS OrbStack / Docker Desktop) the container can't # reach the host's directly-attached LAN peers by default. The entrypoint -# then sets up the host as an SSH jump (use the `dssh` alias, or add -# `ProxyJump host` to targets in your bind-mounted ~/.ssh/config). On native -# Linux Docker the LAN is reachable directly and this is a no-op. +# then sets up the host as an SSH jump (use the `dssh` alias). Reach the host +# with `dssh host`; for named LAN peers put `ProxyJump host` overrides in a +# host-owned ~/.config/devbox-shell/ssh-lan.conf (bind-mounted in) rather than +# editing ~/.ssh/config. On native Linux Docker the LAN is reachable directly +# and this is a no-op. # See the opencode-devbox README for the full walkthrough. # # DEVBOX_LAN_ACCESS: auto (default) | jump | off @@ -22,6 +24,9 @@ SSH_KEY_PATH=~/.ssh # HOST_SSH_USER: your username on the host (required for the jump). On first # start the entrypoint prints the public key to authorize on the host. # HOST_SSH_USER= +# DEVBOX_LAN_AUTOJUMP_PRIVATE: 1 = ProxyJump any private (RFC1918) IP through +# the host, so bare `dssh user@` works on whatever LAN you're roaming on. +# DEVBOX_LAN_AUTOJUMP_PRIVATE=0 # ── Git Configuration ──────────────────────────────────────────────── GIT_USER_NAME= diff --git a/CHANGELOG.md b/CHANGELOG.md index 09bae73..f7fa29d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,21 @@ Tags follow the pi npm version: `v{pi_version}[letter]` — bare tag for the fir ## Unreleased -_(no changes since v0.78.0b)_ +### Fixed / Added (inherited from the base via `FROM`) + +LAN-access improvements made in opencode-devbox's `setup-lan-access.sh` (baked +into the `base-pi-only` image) flow through to pi-devbox automatically — no +pi-devbox source change. Cut a fresh `base-pi-only` after the opencode-devbox +release to pick them up: + +- **Fixed:** the generated `~/.ssh-local/config` had `Include ~/.ssh/config` + scoped to the `host`/`mac` block, so `dssh ` by name was ignored. +- **Fixed:** read-only `~/.ssh/cm` ControlPath broke multiplexed hosts + (`pmx-jh`, `proxmox*`, …); master sockets now use the writable sidecar. +- **Added:** host-owned `~/.config/devbox-shell/ssh-lan.conf` for named-peer + `ProxyJump host` overrides (Included before `~/.ssh/config`). +- **Added:** `DEVBOX_LAN_AUTOJUMP_PRIVATE=1` — ProxyJump any RFC1918 IP through + the host for roaming laptops. ## v0.78.0b — 2026-06-03 diff --git a/README.md b/README.md index 8e7a57d..6125ec3 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Base tooling: - **Gitea MCP** server - **Dev tools**: neovim (LazyVim), tmux, bat, eza, fzf, zoxide, ripgrep, jq, git-lfs, make - **Shell**: bash with history tuning, prefix-search, fzf/zoxide integration -- **Host-OS-agnostic LAN access** — on VM-backed hosts (macOS OrbStack / Docker Desktop) the entrypoint sets up the host as an SSH jump so you can reach LAN peers (`dssh` alias; `DEVBOX_LAN_ACCESS`/`HOST_SSH_USER` env). No-op on native Linux. +- **Host-OS-agnostic LAN access** — on VM-backed hosts (macOS OrbStack / Docker Desktop) the entrypoint sets up the host as an SSH jump so you can reach LAN peers (`dssh` alias; `DEVBOX_LAN_ACCESS` / `HOST_SSH_USER` / `DEVBOX_LAN_AUTOJUMP_PRIVATE` env; host-owned `~/.config/devbox-shell/ssh-lan.conf` for named-peer jumps). No-op on native Linux. pi and companions: @@ -202,6 +202,7 @@ All config flows through `.env`. The full list (with annotations) is in [`.env.e | `GITHUB_PERSONAL_ACCESS_TOKEN` | (unset) | GitHub MCP server / git ops over HTTPS | | `DEVBOX_LAN_ACCESS` | `auto` | LAN-access mode: `auto` (jump only on VM-backed hosts), `jump`, `off` | | `HOST_SSH_USER` | (unset) | Host username for the LAN SSH jump (see opencode-devbox README) | +| `DEVBOX_LAN_AUTOJUMP_PRIVATE` | `0` | `1` = ProxyJump any private (RFC1918) IP through the host (roaming-friendly; see opencode-devbox README) | | `LANG` / `LANGUAGE` / `LC_ALL` | `en_US.UTF-8` | Locale override | ---