Improve cloudflared installation: remove old repos, add GitHub fallback

Author: hfu

install.sh

@@ -151,12 +151,38 @@ ensure_cloudflared_if_requested() {
 
 	echo "Installing cloudflared for Cloudflare Tunnel support..."
 	if ! command -v cloudflared >/dev/null 2>&1; then
+		# Remove any old/conflicting Cloudflare repository sources
+		rm -f /etc/apt/sources.list.d/cloudflare*.list 2>/dev/null || true
+		
 		# Add Cloudflare's Debian repository (updated 2025)
 		mkdir -p --mode=0755 /usr/share/keyrings
 		curl -fsSL https://pkg.cloudflare.com/cloudflare-main.gpg | tee /usr/share/keyrings/cloudflare-main.gpg >/dev/null || true
 		echo "deb [signed-by=/usr/share/keyrings/cloudflare-main.gpg] https://pkg.cloudflare.com/cloudflared any main" | tee /etc/apt/sources.list.d/cloudflared.list || true
-		apt-get update
-		apt-get install -y cloudflared || warn "cloudflared installation failed; tunnel features will be unavailable"
+		
+		# Attempt apt installation first
+		if apt-get update 2>&1 | grep -q "pkg.cloudflare.com.*404"; then
+			echo "warn: Cloudflare repository unreachable; attempting binary download from GitHub..."
+			# Fallback: download binary directly from GitHub releases
+			ARCH=$(dpkg --print-architecture)
+			case "$ARCH" in
+				amd64) CLOUDFLARED_ARCH="amd64" ;;
+				arm64) CLOUDFLARED_ARCH="arm64" ;;
+				armhf) CLOUDFLARED_ARCH="arm" ;;
+				*) warn "Unsupported architecture: $ARCH"; return 1 ;;
+			esac
+			LATEST_URL="https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${CLOUDFLARED_ARCH}"
+			TMP_CLOUDFLARED="/tmp/cloudflared"
+			if curl -fsSL "$LATEST_URL" -o "$TMP_CLOUDFLARED"; then
+				chmod +x "$TMP_CLOUDFLARED"
+				mv "$TMP_CLOUDFLARED" /usr/local/bin/cloudflared
+				echo "cloudflared installed via GitHub release"
+			else
+				warn "Failed to download cloudflared from GitHub"
+				return 1
+			fi
+		else
+			apt-get install -y cloudflared || warn "cloudflared installation failed; tunnel features will be unavailable"
+		fi
 	else
 		echo "cloudflared already installed"
 	fi