This commit is contained in:
parent
7098ac75cb
commit
df91762271
29 changed files with 3079 additions and 838 deletions
|
|
@ -157,7 +157,7 @@ ORDERS=$(systemctl cat "$UNIT" | sed -n 's/^[[:space:]]*--orders=\([^ \\]*\).*/\
|
|||
[ -n "$ORDERS" ] || ORDERS=/var/lib/catcrafts/orders.jsonl
|
||||
ENVF=$(systemctl cat "$UNIT" | sed -n 's/^EnvironmentFile=-\{0,1\}\(.*\)/\1/p' | head -1)
|
||||
[ -n "$ENVF" ] || ENVF=/etc/catcrafts/payments.env
|
||||
[ -e "$ENVF" ] || { echo "apply: $ENVF does not exist — is the Mollie side even configured?" >&2; exit 1; }
|
||||
[ -e "$ENVF" ] || { echo "apply: $ENVF does not exist — is the bank rail even configured?" >&2; exit 1; }
|
||||
|
||||
# Respect an explicit EURC_POOL override if one is already configured;
|
||||
# otherwise the server's default: the pool hangs off the orders path.
|
||||
|
|
@ -198,8 +198,8 @@ install -m 0644 "$work/chains.json" "$CHAINS_DEST"
|
|||
#
|
||||
# Two bugs lived in the one-liner this replaces. First, payments.env is
|
||||
# hand-maintained, so its last line may have no trailing newline — and then a
|
||||
# bare >> concatenated onto it, turning MOLLIE_API_KEY=live_abc into
|
||||
# MOLLIE_API_KEY=live_abcEURC_CHAINS=/etc/... : both rails broken, and the
|
||||
# bare >> concatenated onto it, turning TRANSFER_IBAN=NL00 into
|
||||
# TRANSFER_IBAN=NL00EURC_CHAINS=/etc/... : both rails broken, and the
|
||||
# rollback below could not even see it because the line no longer started with
|
||||
# EURC_CHAINS. Second, the rollback deleted EVERY EURC_CHAINS= line, including
|
||||
# one the operator had set themselves pointing at a different chains file — so
|
||||
|
|
|
|||
Loading…
Reference in a new issue