hernani/taler-monitoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

release 1.10.11: force surface/aptdeploy job scope (MON_HOSTS)

Browse source
This commit is contained in:
Hernâni Marques 2026-07-19 01:51:13 +02:00
parent 021cf5164a
commit 341504f1ad
No known key found for this signature in database
GPG key ID: CB5738652768F7E9
5 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
host-agent/run-aptdeploy-monitoring.sh
View file

@ -20,10 +20,10 @@ export SKIP_SSH=0
export CONTINUE_ON_ERROR="${CONTINUE_ON_ERROR:-1}"
# four containers + checks; allow long wall
export RUN_TIMEOUT="${RUN_TIMEOUT:-1800}"
# dedicated job: always aptdeploy only
export PHASES="${PHASES:-aptdeploy monpages}"
# Only merchant public front — not bank/exchange
export MON_HOSTS="${MON_HOSTS:-taler.hacktivism.ch}"
# dedicated job: always aptdeploy only (force — do not inherit main-timer env)
export PHASES="aptdeploy monpages"
# Public HTML only on taler.hacktivism.ch (not bank/exchange landings)
export MON_HOSTS="taler.hacktivism.ch"
export HTML_OUT="${HTML_OUT:-$HOME/monitoring-sites-staging}"
export DEPLOY_WWW_ROOT="${DEPLOY_WWW_ROOT:-/var/www/monitoring-sites}"
@ -32,9 +32,8 @@ export HTML_ERR_DIR="taler-monitoring-aptdeploy_err"
export HTML_URL_OK="/taler-monitoring-aptdeploy/"
export HTML_URL_ERR="/taler-monitoring-aptdeploy_err/"
export PAGE_LABEL="taler-monitoring-aptdeploy"
# monpages: only this job’s /taler-monitoring-aptdeploy* — not bank/exchange
# landings or surface (those belong to run-hacktivism-monitoring / surface timer).
export MONPAGES_INVENTORY="${MONPAGES_INVENTORY:-job}"
# monpages: only this job’s paths on taler.hacktivism.ch
export MONPAGES_INVENTORY="job"
# Ensure all four apt-src containers (fresh rebuild + upgrade track)
if [ "${APT_DEPLOY_ENSURE:-1}" = "1" ] \

2
host-agent/run-host-report.sh
View file

@ -39,6 +39,8 @@ _wrap_keys=(
RUN_TIMEOUT STATE_NAME AGENT_LABEL MON_HOSTS TALER_DOMAIN DEPLOY_WWW_ROOT
INSIDE_PODMAN INSIDE_MODE LOCAL_STACK SKIP_SSH CONTINUE_ON_ERROR AUTH401_CONTINUE
APT_DEPLOY_ENSURE SURFACE_SCOPE TALER_DOMAIN_FROM_CLI STRICT_EXIT SOURCE_SUITE_PATH
MONPAGES_INVENTORY MONPAGES_CHECK_BARE MONPAGES_BARE_STRICT MONPAGES_REQUIRE_PUBLIC
CHECK_BANK MERCHANT_REQUIRED CHECK_LANDING
)
for _k in "${_wrap_keys[@]}"; do
if [ -n "${!_k+x}" ]; then

10
host-agent/run-surface-monitoring.sh
View file

@ -27,10 +27,10 @@ export INSIDE_MODE="${INSIDE_MODE:-local-podman}"
export CONTINUE_ON_ERROR="${CONTINUE_ON_ERROR:-1}"
export RUN_TIMEOUT="${RUN_TIMEOUT:-2400}"
# All ecosystem checks → one surface HTML report
export PHASES="${PHASES:-surface mattermost mail versions monpages}"
# All ecosystem checks → one surface HTML report (force — do not inherit main-timer env)
export PHASES="surface mattermost mail versions monpages"
export MON_HOSTS="${MON_HOSTS:-taler.hacktivism.ch}"
export MON_HOSTS="taler.hacktivism.ch"
export HTML_OUT="${HTML_OUT:-$HOME/monitoring-sites-staging}"
export DEPLOY_WWW_ROOT="${DEPLOY_WWW_ROOT:-/var/www/monitoring-sites}"
@ -43,8 +43,8 @@ export PAGE_LABEL="taler-monitoring-surface"
export SURFACE_SCOPE="${SURFACE_SCOPE:-ecosystem}"
export TALER_DOMAIN_FROM_CLI=0
export APT_DEPLOY_ENSURE=0
# monpages job-only for this path (surface HTML); not the 9 landings
export MONPAGES_INVENTORY="${MONPAGES_INVENTORY:-job}"
# monpages job-only for surface paths on taler.hacktivism.ch
export MONPAGES_INVENTORY="job"
# package behind → ERROR (v1.8.0)
export TALER_PKG_BEHIND="${TALER_PKG_BEHIND:-error}"