mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 10:59:59 +00:00
Every script a role ships now lives under `files/<language>/`, and the unit
suite is split the same way: `tests/unit/python/` beside new sibling trees for
the other languages. `tests/lint/filesystem/test_role_files_layout.py` keeps it
that way; directories whose shape is dictated from outside carry a `.nocheck`
naming the constraint (Docker build contexts, WordPress mu-plugins, the Joomla
extension, Odoo addons, Playwright suites, the `files/test/test.sh` harness
that `test-e2e-cli` resolves generically).
This cannot be applied in halves. Moving a file and repointing what names it
are the same change: 14 references resolve only at deploy time, so the tree is
green either before or after, never between.
Those 14 were found by static resolution over every reference class, not by the
test suite -- a full `make quality-high` was green while all of them were
broken:
* 7 `src:` values built from a role variable holding a bare filename
(svc-bkp-remote-2-local, decidim, espocrm, friendica, joomla, pixelfed x2).
The variable doubles as the destination name inside the container, so the
language segment belongs at the call site, not in the variable.
* `sys-service/tasks/04_base.yml` resolved every consumer's systemd script
through `first_found(..., errors='strict')` over `files/script.{sh,py}`.
18 roles ship exactly that and have no template fallback: the play would
have died on each.
* `sys-front-inj-javascript` fell back to `<role>/files/javascript.js`; the
interface now reads `files/javascript/javascript.js`.
* `sys-front-inj-logout/templates/head_sub.j2` built the cache-busting mtime
path through `path_absolute(... 'files', ...)`.
* 4 `ansible.builtin.script:` invocations naming a bare command
(pull.py, prune.sh, set_postgres_superuser_password.sh, ganesha-serve.sh).
* `dev-python/files/shell/install.sh` pointed at a sibling role's script.
Depth-dependent paths inside the moved trees were bumped accordingly: 59
`parents[N]` computations, 12 relative climbs, and the per-role recover CLI,
whose path `cli/administration/recover/recoverers.py` still assembled from the
pre-move location.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
52 lines
2.9 KiB
Bash
Executable File
52 lines
2.9 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
#
|
|
# XWiki-specific rescue diagnostics: probe what the generic snapshot cannot,
|
|
# namely whether the extension repositories (nexus.xwiki.org, Maven Central)
|
|
# are reachable from the container, plus the mounted xwiki.properties. Writes
|
|
# into the shared rescue diagnostics folder so it ships in the uploaded
|
|
# snapshot. Prints one summary line and always exits 0 so the final rescue.sh
|
|
# still runs.
|
|
#
|
|
# Required environment:
|
|
# XWIKI_CONTAINER_ADDRESS exec address of the xwiki container
|
|
set -u
|
|
|
|
: "${XWIKI_CONTAINER_ADDRESS:?XWIKI_CONTAINER_ADDRESS not set}"
|
|
|
|
OUT_BASE="${INFINITO_RESCUE_DIAGNOSTICS_DIR:?INFINITO_RESCUE_DIAGNOSTICS_DIR not set (SPOT: group_vars/all/05_paths.yml)}"
|
|
mkdir -p "${OUT_BASE}"
|
|
out="${OUT_BASE}/xwiki-extensions.txt"
|
|
|
|
runtime() {
|
|
if command -v container >/dev/null 2>&1; then
|
|
container "$@"
|
|
else
|
|
docker "$@"
|
|
fi
|
|
}
|
|
|
|
{
|
|
echo "===== extension repo reachability ====="
|
|
runtime exec "${XWIKI_CONTAINER_ADDRESS}" sh -lc '
|
|
echo "== DNS ==";
|
|
getent hosts nexus.xwiki.org || true; # nocheck: shell-or-true -- grandfathered: worked in practice; TODO: sharpen to catch only the exact tolerated error
|
|
getent hosts repo1.maven.org || true; # nocheck: shell-or-true -- grandfathered: worked in practice; TODO: sharpen to catch only the exact tolerated error
|
|
echo "== HTTP ==";
|
|
wget -S -O- -T 10 https://nexus.xwiki.org/ 2>&1 | head -n 30 || true; # nocheck: shell-or-true -- grandfathered: worked in practice; TODO: sharpen to catch only the exact tolerated error
|
|
wget -S -O- -T 10 https://repo1.maven.org/maven2/ 2>&1 | head -n 30 || true; # nocheck: shell-or-true -- grandfathered: worked in practice; TODO: sharpen to catch only the exact tolerated error
|
|
' 2>&1 || true # nocheck: shell-or-true -- grandfathered: worked in practice; TODO: sharpen to catch only the exact tolerated error
|
|
echo
|
|
echo "===== xwiki.properties (first 200 lines) ====="
|
|
# shellcheck disable=SC2016 # $p expands in the inner sh -lc, not here
|
|
runtime exec "${XWIKI_CONTAINER_ADDRESS}" sh -lc '
|
|
p=/usr/local/tomcat/webapps/ROOT/WEB-INF/xwiki.properties;
|
|
ls -la "$p" || true; # nocheck: shell-or-true -- grandfathered: worked in practice; TODO: sharpen to catch only the exact tolerated error
|
|
sed -n "1,200p" "$p" 2>/dev/null || true; # nocheck: shell-or-true -- grandfathered: worked in practice; TODO: sharpen to catch only the exact tolerated error
|
|
echo "== extension.repositories ==";
|
|
grep -n "^[[:space:]]*extension\.repositories" "$p" 2>/dev/null || true; # nocheck: shell-or-true -- grandfathered: worked in practice; TODO: sharpen to catch only the exact tolerated error
|
|
' 2>&1 || true # nocheck: shell-or-true -- grandfathered: worked in practice; TODO: sharpen to catch only the exact tolerated error
|
|
} >"${out}" 2>&1 || true # nocheck: shell-or-true -- grandfathered: worked in practice; TODO: sharpen to catch only the exact tolerated error
|
|
|
|
echo "🩺 XWiki extension diagnostics captured to ${out}"
|
|
exit 0
|