From bc1ff5e2dd706eec8824f449bfee7cb5ae74b1b7 Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 16 Apr 2026 22:27:46 +0800 Subject: [PATCH] Update mermaids.sh --- mermaids.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/mermaids.sh b/mermaids.sh index b502960..a36df1b 100644 --- a/mermaids.sh +++ b/mermaids.sh @@ -130,16 +130,15 @@ PORT="${1:-80}" # 1. Update & install Caddy + deps log "Setting up apt with public DNS..." -mkdir -p /etc/apt/apt.conf.d/ -cat > /etc/apt/apt.conf.d/99dns <<'EOF' + +mkdir -p /etc/apt/apt.conf.d +cat > /etc/apt/apt.conf.d/99-dns <<'EOF' Acquire::Dns "1.1.1.1"; -Acquire::Dns "8.8.8.8"; EOF -# Also override resolv.conf *only during apt* (safer than global) -cat > /etc/resolv.conf.apt <<'EOF' +# Ensure resolv.conf uses a plain DNS for fallback +cat > /etc/resolv.conf <<'EOF' nameserver 1.1.1.1 -nameserver 8.8.8.8 EOF log "Updating package lists..." @@ -147,12 +146,12 @@ log "Updating package lists..." if grep -q "deb debianmain" /etc/apt/sources.list; then sed -i 's/deb \(.*\) main/deb \1 main non-free non-free-firmware/' /etc/apt/sources.list fi -apt-get update -o Acquire::ForceIPv4=true -o Acquire::Dns="1.1.1.1" || { +apt-get update -o Acquire::Retries=3 || { warn "apt-get update failed — checking DNS..." cat /etc/resolv.conf exit 1 } -rm /etc/resolv.conf.apt /etc/apt/apt.conf.d/99dns 2>/dev/null +rm /etc/resolv.conf /etc/apt/apt.conf.d/99-dns 2>/dev/null log "Installing dependencies..." apt-get install -y -qq \