Merge PR #131: stop writing a datadir bitcoin.conf that conflicts with -conf

Root cause of the Bitcoin crash-loop on 100.82.34.38: since a597c1d9
bitcoind launches with -conf=/tmp/rpc.conf and never reads the datadir
bitcoin.conf, but write_bitcoin_conf / ensure_bitcoin_rpc_config /
run_bitcoin_rpc_repair kept writing one on every install and restart.
Bitcoin Core's own datadir-conflict check then refuses to start at all.

Conflict resolved in favour of the PR: HEAD still carried
write_bitcoin_conf, whose deletion is the fix.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

core/archipelago/src/bootstrap.rs

@@ -154,9 +154,9 @@ pub async fn ensure_doctor_installed() {
     }
     match run_bitcoin_rpc_repair().await {
         Ok(true) => {
-            info!("Repaired Bitcoin RPC bind settings; running Bitcoin containers left untouched")
+            info!("Removed stale bitcoin.conf; running Bitcoin containers left untouched")
         }
-        Ok(false) => debug!("Bitcoin RPC bind settings already usable"),
+        Ok(false) => debug!("No stale bitcoin.conf found"),
         Err(e) => warn!("Bitcoin RPC repair failed (non-fatal): {:#}", e),
     }
     match run_apps_dir_repair().await {
@@ -621,52 +621,30 @@ exit 2
 }
 
 async fn run_bitcoin_rpc_repair() -> Result<bool> {
-    // Older installs can have a container-owned bitcoin.conf with only rpcauth
-    // and printtoconsole. Repair it at startup so OTA fixes existing nodes
-    // without a manual uninstall/reinstall. Bind/port stay in the container
-    // command line to avoid duplicate RPC endpoint definitions.
+    // bitcoind is launched with -conf=/tmp/rpc.conf and never reads a
+    // datadir bitcoin.conf (apps/bitcoin-core & bitcoin-knots manifest.yml,
+    // commit a597c1d9 — bind/port live only on the container command line).
+    // A leftover file from an older install makes Bitcoin Core's own
+    // datadir-conflict safety check refuse to start on every subsequent
+    // start. Remove it instead of "repairing" it into existence — this
+    // previously wrote server=/rpcbind=/rpcallowip=/listen= into the file,
+    // which is exactly what caused the conflict.
     let script = r#"
 set -eu
 conf=/var/lib/archipelago/bitcoin/bitcoin.conf
 [ -f "$conf" ] || exit 0
-changed=0
-ensure_line() {
-    line="$1"
-    key="${line%%=*}"
-    if ! grep -q "^${key}=" "$conf"; then
-        printf '%s\n' "$line" >> "$conf"
-        changed=1
-    fi
-}
-ensure_line server=1
-# rpcbind=0.0.0.0 is required inside the container: with rpcallowip set but
-# no rpcbind, bitcoind binds RPC to the container's loopback only and every
-# dial over the container network (LND, bitcoin-ui) is refused — the fresh-
-# install "LND took 5 attempts" / bitcoin-rpc 502 failure (host publish stays
-# 127.0.0.1-only, so exposure is unchanged).
-ensure_line rpcbind=0.0.0.0
-ensure_line rpcallowip=0.0.0.0/0
-ensure_line listen=1
-# Log-volume fix: printtoconsole=1 duplicated every log line (incl. per-block
-# IBD "UpdateTip" spam) into journald via conmon on top of the datadir
-# debug.log bitcoind already writes. Console off; debug.log stays (bitcoind
-# self-shrinks it on restart).
-if grep -q '^printtoconsole=1' "$conf"; then
-    sed -i 's/^printtoconsole=1$/printtoconsole=0/' "$conf"
-    changed=1
-fi
-[ "$changed" -eq 0 ] && exit 0
+mv "$conf" "$conf.disabled-$(date +%s)"
 exit 2
 "#;
     let status = host_sudo(&["sh", "-lc", script])
         .await
-        .context("repair bitcoin.conf RPC bind settings")?;
+        .context("remove stale bitcoin.conf RPC bind settings")?;
     match status.code() {
         Some(0) => Ok(false),
         // Do not restart Bitcoin from bootstrap. During IBD, an automatic
-        // restart can cost hours of progress. The repaired file is only a
-        // fallback for future starts; current containers keep their command-line
-        // RPC args until an operator or update intentionally restarts them.
+        // restart can cost hours of progress. Removing the stale file is
+        // only a fallback for future starts; current containers keep their
+        // command-line RPC args regardless.
         Some(2) => Ok(true),
         _ => {
             warn!("Bitcoin RPC repair helper exited with {}", status);