From 021cf5164a92301f501ad0cf9fc19bddca2e076c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A2ni=20Marques?= Date: Sun, 19 Jul 2026 01:47:44 +0200 Subject: [PATCH] release 1.10.10: monpages bare code 21 soft WARN by default --- VERSION | 2 +- VERSIONS.md | 1 + check_monitoring_pages.sh | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index b0dd753..2ee4474 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.10.9 +1.10.10 diff --git a/VERSIONS.md b/VERSIONS.md index c62e36d..6ca9de2 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -17,6 +17,7 @@ Git tags: `vMAJOR.FEATURE.FIX` (e.g. `v1.8.0`). File `VERSION` omits the `v` pre | Tag | Date (UTC) | Notes | |-----|------------|--------| +| **v1.10.10** | 2026-07-19 | **Bugfix:** monpages bare code 21 is WARN again by default (slash form remains ERROR); bare redir still needs live Caddy `redir *` — set MONPAGES_BARE_STRICT=1 to enforce. | | **v1.10.9** | 2026-07-19 | **Bugfix:** stats policy INFO no longer says bare “ERROR” (false #first-error on www.stats-01); extract_errors only from `┌ ERROR` badges. | | **v1.10.8** | 2026-07-19 | **Docs/clarity:** only three public mon URL families (`/monitoring`, `/taler-monitoring-surface`, `/taler-monitoring-aptdeploy`) each bare+slash(+_err); suite name ≠ path; no `/taler-monitoring` page. | | **v1.10.7** | 2026-07-19 | **Bugfix:** stop always-rsync of **stale suite-overlay** over Forgejo tip (broke stage sticky / new site-gen). Overlay only when suite missing phases. | diff --git a/check_monitoring_pages.sh b/check_monitoring_pages.sh index 046e646..0a66bd1 100755 --- a/check_monitoring_pages.sh +++ b/check_monitoring_pages.sh @@ -396,8 +396,15 @@ check_one() { fi if grep -qE '"code"[[:space:]]*:[[:space:]]*21' "$body" 2>/dev/null \ || grep -qiE 'There is no endpoint defined for the URL' "$body" 2>/dev/null; then - # Merchant code 21 is always ERROR (even bare): slash-only soft mode used to hide - # Caddy redir footgun (redir /path/ 302 → Location:302). Bare must 302/200 HTML. + # Bare without trailing slash often hits merchant until Caddy has redir * /path/ 302. + # Default: WARN on bare (soft) so slash-OK stacks still publish green/yellow pages. + # MONPAGES_BARE_STRICT=1 → ERROR (enforce bare redir live). + if [ "$soft" = "1" ]; then + warn "public mon page bare URL" \ + "$url -> HTTP $code code 21 (prefer trailing slash; Caddy: redir * /path/ 302; set MONPAGES_BARE_STRICT=1 to ERROR)" + rm -f "$body" + return 0 + fi _mon_fail_or_soft "public mon page missing" \ "$url -> HTTP $code merchant/API JSON code 21 (Caddy handle/redir; use redir * /path/ 302 inside handle; apply: sudo /home/hernani/koopa-caddy/apply-monitoring-live.sh)" || { rm -f "$body"; return 1; } rm -f "$body"