kevinveenbirkenbachandClaude Opus 5
f2fedfc677
Fourteen real conflicts plus the 66 generated READMEs.
utils/cache/files.py and its test: both sides added a skip-dir rule, resolved
as a union so the root `build/` prune and the per-root walk key coexist.
plugins/lookup/database.py and postgres_libraries.py: main's added lookups kept,
with get_entity_name renamed to entity_name as this branch renamed it.
roles/web-app-{mailu,matrix}/meta/services.yml: main's `covers: [email]` and its
MAIL_PROVIDER-gated email entry, plus this branch's gitlab/jira/n8n/jitsi
consumers, which the merge base carried on neither side.
group_vars/all/17_resource.yml: this branch's lookup('resource', ...) refactor;
main's single added literal is already covered by _POSTGRES_MAX_LOCKS_PER_TRANSACTION.
docs/requirements/035-mcp-proxy-expansion.md: this branch moved the design into
ADR 0003, so the requirement keeps only the user story and the criteria. Main's
delta inside the moved block was two new roles, carried into the ADR audit:
web-app-stalwart as adapter_candidate, svc-net-tor-smtp as privileged_control_plane.
The no_surface total said 99 while its own subcategories summed to 112.
inventories/development/default.yml: biber keeps no explicit email. Both sides fixed
the same CI failure; this branch fixed it in _apply_account_defaults, which renders
biber@{{ DOMAIN_PRIMARY }} (utils/cache/users/__init__.py:68) — byte-identical to
the address main hardcoded, so the inventory line is a second copy of one fact.
roles/web-app-{gitlab,keycloak}/files/playwright/playwright.spec.js and
roles/web-app-gitlab/templates/playwright.env.j2: union of both import sets, with
requireDotenvValue kept over decodeDotenvQuotedValue for CANONICAL_DOMAIN because
an empty value must fail rather than match every substring.
The 66 role READMEs take this side: aceb5295ef moved Cosmos, Quick Setup and
Credits to the documentation build, and test_readme.py now rejects them in a
committed README. Main's prose edits inside them are carried over by hand (the
Mailu deprecation banner, Mailu -> Stalwart in erpnext and zammad), and the two
READMEs main added fresh are stripped of the three generated sections.
roles/web-app-sphinx/README.md stays deleted; 6eb9a59d14 merged that role into
web-app-docs. The root README's generated role table was regenerated from the
merged metadata.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
DNS Setup Scripts 🌐
This directory contains platform-specific scripts for setting up local DNS resolution for the infinito.test domain (and subdomains) on the development machine.
All scripts map *.infinito.test → 127.0.0.1 so that local deployments are reachable via their expected hostnames.
Every stack has its own domain below it (INFINITO_DOMAIN): the primary checkout is main.infinito.test, a worktree from make worktree-up is its branch lowercased with every character outside a-z0-9_- replaced by - (feature/store-i18n → feature-store-i18n.infinito.test).
linux.sh routes each stack's domain to that checkout's INFINITO_BIND_IP, read from the .env of every git worktree list entry. Re-run make network-dns-setup after creating or removing a worktree.
Scripts 📄
linux.sh 🐧
General-purpose DNS setup for Linux systems. Supports multiple strategies depending on the environment:
- NetworkManager + dnsmasq. preferred path when NetworkManager is active; configures the NM dnsmasq plugin with a wildcard zone entry.
- System dnsmasq. fallback when NetworkManager is not running; configures a standalone dnsmasq service.
/etc/hostsfallback. used in non-systemd environments (e.g. Docker containers, LXC) where service management is unavailable; writes a managed block of host entries directly into the hosts file.
Shared helper functions are sourced from ../common.sh.
wsl.sh 🪟
WSL2-specific DNS setup. Only executes when running inside a WSL2 environment (detected via /proc/version). Configures:
- dnsmasq with the discovered WSL2 upstream DNS gateway as forwarder.
- systemd-resolved stub listener disabled to avoid port conflicts.
/etc/resolv.confpointed at the local dnsmasq instance (127.0.0.1)./etc/wsl.confset togenerateResolvConf=falseto prevent WSL from overwriting the resolver config on restart.
Related 🔗
- Makefile Commands. canonical Make target index for this area
../remove.sh. teardown script that undoes the DNS configuration../common.sh. shared variables and helper functions used bylinux.sh