Dan/proxmox-helper-script
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update mermaids.sh

Browse Source
This commit is contained in:
Dan 2026-04-16 09:56:03 +08:00
parent 66b1fbbaaa
commit f98812fc82
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mermaids.sh
View File

@ -129,14 +129,17 @@ log() { echo -e "${GREEN}[$(date +%H:%M:%S)]${NC} $1"; }
PORT="${1:-80}" PORT="${1:-80}"
# 1. Update & install Caddy + deps # 1. Update & install Caddy + deps
# Ensure DNS is configured log "Setting up apt with public DNS..."
log "Setting up DNS..." mkdir -p /etc/apt/apt.conf.d/
if [[ ! -f /etc/resolv.conf.bak ]]; then cat > /etc/apt/apt.conf.d/99dns <<'EOF'
cp /etc/resolv.conf /etc/resolv.conf.bak 2>/dev/null || true Acquire::Dns "1.1.1.1";
fi Acquire::Dns "8.8.8.8";
cat > /etc/resolv.conf <<EOF EOF
# Also override resolv.conf *only during apt* (safer than global)
cat > /etc/resolv.conf.apt <<'EOF'
nameserver 1.1.1.1 nameserver 1.1.1.1
nameserver 208.67.222.222 nameserver 8.8.8.8
EOF EOF
log "Updating package lists..." log "Updating package lists..."
@ -144,11 +147,12 @@ log "Updating package lists..."
if grep -q "deb debianmain" /etc/apt/sources.list; then 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 sed -i 's/deb \(.*\) main/deb \1 main non-free non-free-firmware/' /etc/apt/sources.list
fi 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..." warn "apt-get update failed — checking DNS..."
cat /etc/resolv.conf cat /etc/resolv.conf
exit 1 exit 1
} }
rm /etc/resolv.conf.apt /etc/apt/apt.conf.d/99dns 2>/dev/null
log "Installing dependencies..." log "Installing dependencies..."
apt-get install -y -qq \ apt-get install -y -qq \