test-changed: map reorganized dankclaw quadlet subtrees
The pre-commit hook runs scripts/test-changed.sh, which requires a focused-test mapping for every staged path. The quadlets were moved into dankclaw/<svc>/quadlet/ but the mapping still only matched top-level dankclaw/*.container, so any nested quadlet or the pihole addn-hosts/env data files fell through to the catch-all 'die' and blocked commit. Add the nested-quadlet mappings (pihole-specific first, then the dankclaw/*/quadlet/* fallback) plus the pihole data-file paths.
This commit is contained in:
1 parent
ab0ef3f4b7
commit
8d8a5f7842
4 files changed
+21
-3
No files matched your search
@@ -1,6 +1,6 @@
|
|||||||
# A records for the flat franksdank.name scheme (dnsmasq addn-hosts format:
|
# A records for the flat franksdank.name scheme (dnsmasq addn-hosts format:
|
||||||
# <IP> <name> [<name> ...]). Served by the Pi-hole quadlet (FTL is a
|
# <IP> <name> [<name> ...]). Served by the Pi-hole quadlet (FTL is a
|
||||||
# dnsmasq fork): the quadlet mounts this file into /etc/dnsmasq.d/ read-only.
|
# dnsmasq fork): the quadlet mounts this file into /etc/pihole/hosts/ read-only.
|
||||||
#
|
#
|
||||||
# Caddy is consolidated on dankclaw (192.168.0.143): it fronts every service
|
# Caddy is consolidated on dankclaw (192.168.0.143): it fronts every service
|
||||||
# on both hosts, so every name resolves to that one IP. Keep in sync with the
|
# on both hosts, so every name resolves to that one IP. Keep in sync with the
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
# The LAN's authoritative DNS for the flat franksdank.cloud / franksdank.casa
|
# The LAN's authoritative DNS for the flat franksdank.cloud / franksdank.casa
|
||||||
# name scheme. It retired the dnsmasq quadlet (2026-08-24): Pi-hole FTL is a
|
# name scheme. It retired the dnsmasq quadlet (2026-08-24): Pi-hole FTL is a
|
||||||
# dnsmasq fork, so the addn-hosts record file carries over unchanged and is
|
# dnsmasq fork, so the addn-hosts record file carries over unchanged and is
|
||||||
# mounted into /etc/dnsmasq.d/ (the FTL dnsmasq config dir). It serves one A
|
# mounted into /etc/pihole/hosts/ (the FTL hostsdir) read-only. It serves one A
|
||||||
# record per Caddy vhost and forwards everything else to the pinned upstream
|
# record per Caddy vhost and forwards everything else to the pinned upstream
|
||||||
# resolvers (DNS1/DNS2 in the env file). The SURFboard G36 router hands this
|
# resolvers (DNS1/DNS2 in the env file). The SURFboard G36 router hands this
|
||||||
# server out to DHCP clients (DNS statically configured -> 192.168.0.143),
|
# server out to DHCP clients (DNS statically configured -> 192.168.0.143),
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ The G36 has no NAT loopback (hairpin). A LAN client that resolves a name to the
|
|||||||
|
|
||||||
## Pi-hole quadlet
|
## Pi-hole quadlet
|
||||||
|
|
||||||
Pi-hole FTL is a dnsmasq fork. It serves the same `addn-hosts` file the retired dnsmasq quadlet used, mounted into `/etc/dnsmasq.d/` read-only. It retired the dnsmasq quadlet on 2026-08-24.
|
Pi-hole FTL is a dnsmasq fork. It serves the same `addn-hosts` file the retired dnsmasq quadlet used, mounted into `/etc/pihole/hosts/` read-only. It retired the dnsmasq quadlet on 2026-08-24.
|
||||||
|
|
||||||
- **Location:** `dankclaw/pihole/` — `quadlet/pihole.container`, `env.example`, `addn-hosts`
|
- **Location:** `dankclaw/pihole/` — `quadlet/pihole.container`, `env.example`, `addn-hosts`
|
||||||
- **Ports:** 53/udp + 53/tcp (DNS) and 8083/tcp (web UI) on 192.168.0.143
|
- **Ports:** 53/udp + 53/tcp (DNS) and 8083/tcp (web UI) on 192.168.0.143
|
||||||
|
|||||||
@@ -110,6 +110,24 @@ for path in "${CHANGED[@]}"; do
|
|||||||
add_test tests/searxng_quadlet.bats
|
add_test tests/searxng_quadlet.bats
|
||||||
add_test tests/deployment_scoping.bats
|
add_test tests/deployment_scoping.bats
|
||||||
;;
|
;;
|
||||||
|
# Quadlets live under dankclaw/<svc>/quadlet/ (reorganized out of the
|
||||||
|
# top-level dankclaw/*.container globs above). Map the whole subtree so
|
||||||
|
# changes to the pihole, open-webui, searxng, and gitea quadlets hit
|
||||||
|
# their seam tests. The pihole-specific block must come first: shell
|
||||||
|
# case matches the first pattern, and dankclaw/pihole/quadlet/*.container
|
||||||
|
# also satisfies the dankclaw/*/quadlet/*.container fallback.
|
||||||
|
dankclaw/pihole/addn-hosts|dankclaw/pihole/env.example|dankclaw/pihole/quadlet/*.container|dankclaw/pihole/quadlet/*.network)
|
||||||
|
add_test tests/pihole.bats
|
||||||
|
add_test tests/docs_completeness.bats
|
||||||
|
add_test tests/deployment_scoping.bats
|
||||||
|
;;
|
||||||
|
dankclaw/*/quadlet/*.container|dankclaw/*/quadlet/*.network)
|
||||||
|
add_test tests/open_webui_quadlet.bats
|
||||||
|
add_test tests/pihole.bats
|
||||||
|
add_test tests/searxng_quadlet.bats
|
||||||
|
add_test tests/docs_completeness.bats
|
||||||
|
add_test tests/deployment_scoping.bats
|
||||||
|
;;
|
||||||
scripts/deploy.sh|scripts/deploy-remote.sh|scripts/deploy-plan.py|scripts/deploy-*-quadlet.sh)
|
scripts/deploy.sh|scripts/deploy-remote.sh|scripts/deploy-plan.py|scripts/deploy-*-quadlet.sh)
|
||||||
add_test tests/deployment_flow.bats
|
add_test tests/deployment_flow.bats
|
||||||
add_test tests/deployment_scoping.bats
|
add_test tests/deployment_scoping.bats
|
||||||
|
|||||||
Reference in new issue
Block a user