diff --git a/mermaids.sh b/mermaids.sh index b3c9393..b502960 100644 --- a/mermaids.sh +++ b/mermaids.sh @@ -129,14 +129,17 @@ log() { echo -e "${GREEN}[$(date +%H:%M:%S)]${NC} $1"; } PORT="${1:-80}" # 1. Update & install Caddy + deps -# Ensure DNS is configured -log "Setting up DNS..." -if [[ ! -f /etc/resolv.conf.bak ]]; then - cp /etc/resolv.conf /etc/resolv.conf.bak 2>/dev/null || true -fi -cat > /etc/resolv.conf < /etc/apt/apt.conf.d/99dns <<'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' nameserver 1.1.1.1 -nameserver 208.67.222.222 +nameserver 8.8.8.8 EOF log "Updating package lists..." @@ -144,11 +147,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::Retries=3 || { +apt-get update -o Acquire::ForceIPv4=true -o Acquire::Dns="1.1.1.1" || { 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 log "Installing dependencies..." apt-get install -y -qq \