mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 19:01:54 +00:00
Only two files were touched by both sides. env.js merged automatically: the incoming side owns recordVideoOptions and this branch had cherry-picked that same function from it, so the result carries one definition. README.md is the generated roles index and both sides append rows; resolved as a union, taking the incoming side for the three rows it edits (OnlyOffice, Open WebUI, OpenClaw) and keeping ours only for OpenBao, then re-sorted. The incoming side adds lint rules and resources that this role then violated. Five fixes, each the remedy the failing rule names: * services.openbao.ports.local.http 8081 -> 8093; svc-ai-litellm now holds 8081. * meta/networks.yml subnet 192.168.221.0/24 -> 192.168.222.0/24; svc-ai-mcp-adapter now holds 221, and the suggester only sub-allocates inside occupied /24s, so the next free block was taken directly. * services.email bond 1 -> 0; the entry is disabled and the resource model skips it before reading the weight. * README Quick Setup regenerated from the template it had drifted from. * Credits link the implementer, matching how they are credited elsewhere. * docs/requirements/035-mcp-proxy-expansion.md disposes of web-app-openbao as privileged_control_plane, which is what a secrets manager is, and the list count follows. Verified against a worktree of #454 alone so the baseline is measured rather than assumed: lint 501 passed with only the branch-name rule failing, which fails identically on that baseline because the worktree branch is named merge/*; unit 5665 passed with the same three host-environment failures the baseline has; integration 324 passed, 0 failed.