diff --git a/mermaids.sh b/mermaids.sh index 65e0286..7dcafa9 100644 --- a/mermaids.sh +++ b/mermaids.sh @@ -132,25 +132,38 @@ log() { echo -e "${GREEN}[$(date +%H:%M:%S)]${NC} $1"; } PORT="${1:-80}" # 1. Update & install Caddy + deps -log "Setting up apt with public DNS..." +# log "Setting up apt with public DNS..." -mkdir -p /etc/apt/apt.conf.d -cat > /etc/apt/apt.conf.d/99-dns <<'EOF' -Acquire::Dns "1.1.1.1"; -EOF +# mkdir -p /etc/apt/apt.conf.d +# cat > /etc/apt/apt.conf.d/99-dns <<'EOF' +# Acquire::Dns "1.1.1.1"; +# EOF -# Ensure resolv.conf uses a plain DNS for fallback -cat > /etc/resolv.conf <<'EOF' -nameserver 1.1.1.1 -EOF +# # Ensure resolv.conf uses a plain DNS for fallback +# cat > /etc/resolv.conf <<'EOF' +# nameserver 1.1.1.1 +# EOF -log "Updating package lists..." -# Enable non-free for ufw (Debian 12 requirement) -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 +# log "Updating package lists..." +# # Enable non-free for ufw (Debian 12 requirement) +# 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 +# rm /etc/resolv.conf /etc/apt/apt.conf.d/99-dns 2>/dev/null + +log "Fixing Debian CDN routing..." +# Try AdGuard's CDN node first +if curl -sf http://146.75.22.132/debian/dists/bookworm/Release >/dev/null 2>&1; then + sed -i "s|http://deb.debian.org|http://146.75.22.132|g" /etc/apt/sources.list + log "Using Fastly node: 146.75.22.132" +# Fallback to Cloudflare's CDN node +elif curl -sf http://151.101.2.132/debian/dists/bookworm/Release >/dev/null 2>&1; then + sed -i "s|http://deb.debian.org|http://151.101.2.132|g" /etc/apt/sources.list + log "Using Fastly node: 151.101.2.132" +else + warn "Both Fastly nodes unreachable — trying direct domain (may fail)" fi -apt-get update -o Acquire::Retries=3 -rm /etc/resolv.conf /etc/apt/apt.conf.d/99-dns 2>/dev/null log "Installing dependencies..." apt-get install -y -qq \