From fb5b1587e3ff9951b92c8c79cf8c796f79c02d41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A2ni=20Marques?= <hernani+clementine@vecirex.net>
Date: Sun, 19 Jul 2026 01:39:48 +0200
Subject: [PATCH] release 1.10.7: do not overlay stale site-gen over suite tip

---
 VERSION                       |  2 +-
 VERSIONS.md                   |  1 +
 host-agent/run-host-report.sh | 12 ++----------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/VERSION b/VERSION
index 7b4d9a4..ccff224 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.10.6
+1.10.7
diff --git a/VERSIONS.md b/VERSIONS.md
index 979800b..c83c16d 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.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. |
 | **v1.10.6** | 2026-07-19 | **Fix:** stage mon HTML quality — suite update out of public log; filter git noise; stage-specific sticky (not GOA); `CHECK_BANK=0` / `MERCHANT_REQUIRED` for mytops stage scope. |
 | **v1.10.5** | 2026-07-19 | **Fix:** aptdeploy monpages **job-only** (own `/taler-monitoring-aptdeploy*`); full GOA mon inventory + bare URL checks stay on **hacktivism** general run — no bank/exchange/surface monpages noise on aptdeploy HTML. |
 | **v1.10.4** | 2026-07-19 | **Fix:** suite **auto-upgrade strict** (`SUITE_UPDATE_STRICT=1` default — abort on fetch fail); monpages ERROR on **bootstrap** HTML; ship mytops-stage timer/service units; host-agent refuses stale tree. |
diff --git a/host-agent/run-host-report.sh b/host-agent/run-host-report.sh
index 9f04a79..cfabd66 100755
--- a/host-agent/run-host-report.sh
+++ b/host-agent/run-host-report.sh
@@ -226,16 +226,8 @@ elif [ "$_need_overlay" = "1" ]; then
   ROOT="$AGENT_MON"
 else
   echo "using suite mon @ ${COMMIT_SHORT:-?} · $ROOT"
-fi
-# Always restore host-agent + site-gen from pre-reset snapshot when present
-# (systemd ExecStart points at ~/src/taler-monitoring; overlay may lag Forgejo).
-if [ -d "$OVERLAY_DIR/host-agent" ]; then
-  mkdir -p "$SUITE_MON/host-agent" 2>/dev/null || true
-  rsync -a "$OVERLAY_DIR/host-agent/" "$SUITE_MON/host-agent/" 2>/dev/null || true
-fi
-if [ -d "$OVERLAY_DIR/site-gen" ]; then
-  mkdir -p "$SUITE_MON/site-gen"
-  rsync -a "$OVERLAY_DIR/site-gen/" "$SUITE_MON/site-gen/" 2>/dev/null || true
+  # Do NOT rsync suite-overlay over a fresh Forgejo tree — that reintroduced
+  # stale site-gen/host-agent (bootstrap sticky, old monpages) on stage/betel.
 fi
 unset _need_overlay