fix(bitcoin): repair the startup script I broke in 1.7.124, and gate against it

The bitcoin app vanished from updated nodes: the container exited instantly
with 'sh: Syntax error: "fi" unexpected'. My 1.7.124 change added an
explanatory comment INSIDE the manifest's folded YAML scalar (>-), where
'#' is not a comment — it is literal text that reaches the shell. Folding
joins lines with spaces, so the comment swallowed the 'if ... then' while
the more-indented echo survived as its own line, leaving an orphan 'fi'.
bitcoind never ran, the container exited, and the app disappeared from the
UI because detection is container-based.

Explanations now live above the '- >-' line where YAML really treats them
as comments. The loopback-conf tolerance (-allowignoredconf=1) is unchanged
and still needed.

Adds scripts/check-manifest-shell.py to the release gate: it runs 'sh -n'
over every embedded manifest script and rejects '#' inside these scalars.
Nothing validated this shell before — no YAML parse or Rust test could have
caught it, and it only failed on the node, after signing.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
archipelago
2026-08-05 18:45:02 -04:00
co-authored by Claude Fable 5
parent c9f1d87dd6
commit e88c51d80b
4 changed files with 89 additions and 16 deletions
+1 -8
View File
@@ -38,15 +38,8 @@ app:
RPC_CONF="/tmp/rpc.conf";
umask 077;
{ echo "rpcuser=$RPC_USER"; echo "rpcpassword=$RPC_PASS"; } > "$RPC_CONF";
# A stray bitcoin.conf in the datadir is FATAL when -conf points
# elsewhere: bitcoind refuses to start with "contains a bitcoin.conf
# file which is ignored", and the app crash-loops (100.82.34.38,
# 2026-08-05 — Exited(1) every few seconds). Our -conf carries the
# RPC credentials and the flags below are the authoritative config,
# so the datadir file is legacy debris; say so out loud rather than
# failing, and let bitcoind start.
if [ -f /home/bitcoin/.bitcoin/bitcoin.conf ]; then
echo "archipelago: ignoring legacy /home/bitcoin/.bitcoin/bitcoin.conf; RPC config comes from $RPC_CONF and the flags below" >&2;
echo "archipelago: ignoring legacy datadir bitcoin.conf; RPC config comes from $RPC_CONF" >&2;
fi;
RPC_TXRELAY_AUTH="$(printenv BITCOIN_RPC_TXRELAY_RPCAUTH || true)";
DISK_GB_VALUE="$(printenv DISK_GB || true)";
+1 -8
View File
@@ -38,15 +38,8 @@ app:
RPC_CONF="/tmp/rpc.conf";
umask 077;
{ echo "rpcuser=$RPC_USER"; echo "rpcpassword=$RPC_PASS"; } > "$RPC_CONF";
# A stray bitcoin.conf in the datadir is FATAL when -conf points
# elsewhere: bitcoind refuses to start with "contains a bitcoin.conf
# file which is ignored", and the app crash-loops (100.82.34.38,
# 2026-08-05 — Exited(1) every few seconds). Our -conf carries the
# RPC credentials and the flags below are the authoritative config,
# so the datadir file is legacy debris; say so out loud rather than
# failing, and let bitcoind start.
if [ -f /home/bitcoin/.bitcoin/bitcoin.conf ]; then
echo "archipelago: ignoring legacy /home/bitcoin/.bitcoin/bitcoin.conf; RPC config comes from $RPC_CONF and the flags below" >&2;
echo "archipelago: ignoring legacy datadir bitcoin.conf; RPC config comes from $RPC_CONF" >&2;
fi;
RPC_TXRELAY_AUTH="$(printenv BITCOIN_RPC_TXRELAY_RPCAUTH || true)";
DISK_GB_VALUE="$(printenv DISK_GB || true)";