monitoring: resolve ladder explorer secret without laptop-hardcoded path
Ladder used /Users/newkamek/… for bank-explorer password and wallet-cli. Use SECRETS_ROOT/read_secret, EXP_PW/EXP_PW_FILE overrides, and find_wallet_cli. Document Android automation prereqs; stage shop assets also require qrcode.min.js.
This commit is contained in:
parent
80d90f5857
commit
c887617bc7
7 changed files with 174 additions and 14 deletions
|
|
@ -1236,7 +1236,8 @@ if [ "${LOCAL_STACK:-1}" = "1" ] || [ -n "${BANK_PUBLIC:-}" ]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
# Merchant shop assets — GOA: shop-pay.*; stage TESTPAYSAN: /assets/shop-ui.js + shops.css
|
||||
# Merchant shop assets — GOA: shop-pay.*; stage TESTPAYSAN: /assets/shop-ui.js +
|
||||
# shops.css + QR encoder (shop-ui modal needs /intro/qrcode.min.js or /qrcode.min.js).
|
||||
_ma=0
|
||||
_ma_need=2
|
||||
_ma_label="shop-pay.js + .css"
|
||||
|
|
@ -1244,9 +1245,16 @@ if [ "${EXPECT_CURRENCY:-}" = "GOA" ] || [ "${LOCAL_STACK:-0}" = "1" ]; then
|
|||
_landing_probe "$MERCHANT_PUBLIC/intro/shop-pay.js" && _ma=$((_ma + 1))
|
||||
_landing_probe "$MERCHANT_PUBLIC/intro/shop-pay.css" && _ma=$((_ma + 1))
|
||||
else
|
||||
_ma_label="shop-ui.js + shops.css"
|
||||
# stage farmer shops: UI + stylesheet + qrcode (pay modal QR_Taler)
|
||||
_ma_need=3
|
||||
_ma_label="shop-ui.js + shops.css + qrcode.min.js"
|
||||
_landing_probe "$MERCHANT_PUBLIC/assets/shop-ui.js" && _ma=$((_ma + 1))
|
||||
_landing_probe "$MERCHANT_PUBLIC/assets/shops.css" && _ma=$((_ma + 1))
|
||||
# Prefer /intro/ (always on landings tree); root alias is Caddy-only convenience
|
||||
if _landing_probe "$MERCHANT_PUBLIC/intro/qrcode.min.js" \
|
||||
|| _landing_probe "$MERCHANT_PUBLIC/qrcode.min.js"; then
|
||||
_ma=$((_ma + 1))
|
||||
fi
|
||||
fi
|
||||
if [ "$_ma" -eq "$_ma_need" ]; then
|
||||
ok "landing merchant shop assets" "${_ma_label}"
|
||||
|
|
@ -1254,9 +1262,11 @@ else
|
|||
if [ "${EXPECT_CURRENCY:-}" = "GOA" ] || [ "${LOCAL_STACK:-0}" = "1" ]; then
|
||||
warn "landing merchant shop assets" "${_ma}/${_ma_need} present (soft) · want ${_ma_label}"
|
||||
else
|
||||
# stage: soft INFO if missing; WARN only if zero
|
||||
if [ "$_ma" -eq 0 ]; then
|
||||
warn "landing merchant shop assets" "0/${_ma_need} · want ${_ma_label}"
|
||||
# stage: hard-ish — missing qrcode broke pay QR («bibliothèque manquante»)
|
||||
if [ "$_ma" -lt 2 ]; then
|
||||
fail "landing merchant shop assets" "${_ma}/${_ma_need} · want ${_ma_label}"
|
||||
elif [ "$_ma" -lt "$_ma_need" ]; then
|
||||
warn "landing merchant shop assets" "${_ma}/${_ma_need} · want ${_ma_label}"
|
||||
else
|
||||
info "landing merchant shop assets" "${_ma}/${_ma_need} · ${_ma_label}"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue