bank: strip :443 from taler://withdraw URIs for wallet apps.
libeufin includes default HTTPS port; demo/auto-account APIs, refresh scripts, and landing JS now normalize hosts without :443. ensure-taler-apps also starts merchant ui-unlock after reboot.
This commit is contained in:
parent
360fb363de
commit
196ba7aba9
5 changed files with 56 additions and 11 deletions
|
|
@ -46,10 +46,26 @@ ctr_has_proc() {
|
|||
podman exec "$ctr" bash -lc "ps -eo args= | grep -F -- '$pattern' | grep -v grep" >/dev/null 2>&1
|
||||
}
|
||||
|
||||
ensure_merchant_loopback_helper() {
|
||||
# Optional helper (loopback helper) — loopback :19097
|
||||
if podman exec "$MER_CTR" bash -lc "ss -tln 2>/dev/null | grep -q ':19097'" 2>/dev/null; then
|
||||
log "merchant: loopback :19097 already listening"
|
||||
return 0
|
||||
fi
|
||||
if ! podman exec "$MER_CTR" test -f /usr/local/bin/ui-unlock-api.py 2>/dev/null; then
|
||||
log "merchant: WARN helper missing"
|
||||
return 0
|
||||
fi
|
||||
log "merchant: start loopback helper :19097…"
|
||||
podman exec -u root -d "$MER_CTR" python3 /usr/local/bin/ui-unlock-api.py \
|
||||
|| log "WARN: loopback helper start failed"
|
||||
}
|
||||
|
||||
ensure_merchant() {
|
||||
wait_running "$MER_CTR"
|
||||
if ctr_has_proc "$MER_CTR" 'taler-merchant-httpd'; then
|
||||
log "merchant: httpd already up"
|
||||
ensure_merchant_loopback_helper
|
||||
return 0
|
||||
fi
|
||||
log "merchant: start base (postgres/nginx)…"
|
||||
|
|
@ -58,6 +74,7 @@ ensure_merchant() {
|
|||
log "merchant: start_merchant.sh…"
|
||||
podman exec -u root "$MER_CTR" \
|
||||
runuser -u taler-merchant-httpd -- /usr/local/bin/start_merchant.sh
|
||||
ensure_merchant_loopback_helper
|
||||
log "merchant: done"
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue