Compare commits

..
4 Commits
Author SHA1 Message Date
kyaring 09e0996b9d refactor(deploy): keep purely Gitea paths and releases in gitea-main branch for Gitea
Release / Build & Release (push) Canceled after 0s
2026-09-28 11:23:45 +08:00
kyaring 97bbe3ced6 refactor(deploy): keep purely GitHub paths and releases in main branch for GitHub
Release / Build & Release (push) Canceled after 0s
2026-09-28 11:23:15 +08:00
kyaring 46af20e96c feat(deploy): support smart dual-source (GitHub + Gitea) binary download with automatic fallback and insecure cert tolerance
Release / Build & Release (push) Canceled after 0s
2026-09-28 11:13:00 +08:00
kyaring c3114492bb ci(release): attribute changelog commits directly to @kyaring
Release / Build & Release (push) Canceled after 0s
2026-09-28 10:37:42 +08:00
4 changed files with 37 additions and 38 deletions
+2 -2
View File
@@ -53,9 +53,9 @@ jobs:
NOTES
if [ -n "$PREV_TAG" ]; then
git log "${PREV_TAG}..HEAD" --pretty=format:"- %s (%h by @%an)" >> release_notes.md
git log "${PREV_TAG}..HEAD" --pretty=format:"- %s (%h by @kyaring)" >> release_notes.md
else
git log -n 10 --pretty=format:"- %s (%h by @%an)" >> release_notes.md
git log -n 10 --pretty=format:"- %s (%h by @kyaring)" >> release_notes.md
fi
echo "" >> release_notes.md
+3 -3
View File
@@ -79,7 +79,7 @@
无论是在受控端 VPS 还是中心端,只需一行命令即可交互式安装与启动:
```bash
bash <(curl -sSL https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/install.sh)
bash <(curl -fsSLk https://gitea.king.nyc.mn/openclaw/vps-commander/raw/branch/main/deploy/install.sh)
```
- **安装 Agent (受控 VPS)**:输入 Hub 的 WSS 地址与通信密钥,全自动配置开机自启并秒级连入集群。
- **安装 Hub (中心服务端)**:自动生成安全 API Key / Web 面板密码并以 Systemd 托管常驻。
@@ -88,9 +88,9 @@ bash <(curl -sSL https://raw.githubusercontent.com/kyaring/vps-commander/main/de
当新版本发布后,无需重新配置通信密钥或重新安装,在任意受控机上直接运行升级脚本:
```bash
curl -fsSL https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/upgrade-agent.sh | bash
curl -fsSLk https://gitea.king.nyc.mn/openclaw/vps-commander/raw/branch/main/deploy/upgrade-agent.sh | bash
```
- 自动检测并拉取 GitHub 最新版本架构包(AMD64 / ARM64);
- 自动检测并拉取 Gitea 最新版本架构包(AMD64 / ARM64);
- 自动备份旧版本二进制(`.bak`);
- 升级异常(校验失败或无法启动)时**自动秒级回滚**,保证节点永不失联。
+22 -24
View File
@@ -2,12 +2,13 @@
set -e
# VPS-Commander 一键安装与配置脚本 (Hub / Agent)
# Repo: https://github.com/kyaring/vps-commander
# Repo: https://gitea.king.nyc.mn/openclaw/vps-commander
REPO="kyaring/vps-commander"
GITEA_HOST="gitea.king.nyc.mn"
REPO="openclaw/vps-commander"
INSTALL_DIR="/opt/vps-commander"
CONF_DIR="/etc/vps-commander"
GITHUB_URL="https://github.com"
GITEA_URL="https://gitea.king.nyc.mn"
# 颜色输出
RED='\033[0;31m'
@@ -37,12 +38,12 @@ command -v curl >/dev/null 2>&1 || (apt-get update && apt-get install -y curl ||
# 获取最新版本 tag
info "正在获取 VPS-Commander 最新版本信息..."
LATEST_TAG=$(curl -fsSL -k "https://api.github.com/repos/${REPO}/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
LATEST_TAG=$(curl -fsSL -k "${GITEA_URL}/api/v1/repos/${REPO}/releases/latest" 2>/dev/null | grep '"tag_name":' | head -n1 | sed -E 's/.*"([^"]+)".*/\1/')
if [ -z "$LATEST_TAG" ]; then
warn "无法通过 GitHub API 自动获取 Tag,将尝试使用默认版本 v1.0.0"
LATEST_TAG="v1.0.0"
warn "无法通过 Gitea API 自动获取 Tag,回退至 v1.1.5"
LATEST_TAG="v1.1.5"
fi
info "检测到最新版本: ${LATEST_TAG}"
info "检测到最新版本: ${LATEST_TAG} (${TARGET_ARCH})"
mkdir -p "$INSTALL_DIR" "$INSTALL_DIR/data" "$CONF_DIR"
chmod 750 "$INSTALL_DIR" "$CONF_DIR"
@@ -58,10 +59,10 @@ select_mode() {
install_agent() {
info "开始安装 VPS-Commander Agent (${TARGET_ARCH})..."
BIN_NAME="vps-commander-agent-linux-${TARGET_ARCH}"
DOWNLOAD_URL="${GITHUB_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
DOWNLOAD_URL="${GITEA_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
info "正在下载 Agent: ${DOWNLOAD_URL}"
curl -fsSL -k -o "${INSTALL_DIR}/vps-commander-agent" "${DOWNLOAD_URL}" || error "下载失败,请检查网络或 Release 是否存在"
info "正在从 Gitea 下载 Agent: ${DOWNLOAD_URL}"
curl -fsSL -k -o "${INSTALL_DIR}/vps-commander-agent" "${DOWNLOAD_URL}" || error "下载失败,请检查 Gitea 网络或 Release 是否存在"
chmod +x "${INSTALL_DIR}/vps-commander-agent"
echo -e "\n--- 配置 Agent 参数 ---"
@@ -77,15 +78,13 @@ install_agent() {
read -rp "Cluster Secret 不能为空,请重新输入: " CLUSTER_SECRET
done
# 写入凭据文件
cat << ENV > "${CONF_DIR}/agent.env"
VPS_COMMANDER_HUB_WS_URL=${HUB_WS}
VPS_COMMANDER_AGENT_NAME=${AGENT_NAME}
VPS_COMMANDER_CLUSTER_SECRET=${CLUSTER_SECRET}
VPS_COMMANDER_CLUSTER_SECRET=***
ENV
chmod 0600 "${CONF_DIR}/agent.env"
# 配置 systemd
cat << SVC > /etc/systemd/system/vps-commander-agent.service
[Unit]
Description=VPS-Commander Agent
@@ -125,34 +124,33 @@ SVC
install_hub() {
info "开始安装 VPS-Commander Hub (${TARGET_ARCH})..."
BIN_NAME="vps-commander-hub-linux-${TARGET_ARCH}"
DOWNLOAD_URL="${GITHUB_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
DOWNLOAD_URL="${GITEA_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
info "正在下载 Hub: ${DOWNLOAD_URL}"
curl -fsSL -k -o "${INSTALL_DIR}/vps-commander-hub" "${DOWNLOAD_URL}" || error "下载失败,请检查网络或 Release 是否存在"
info "正在从 Gitea 下载 Hub: ${DOWNLOAD_URL}"
curl -fsSL -k -o "${INSTALL_DIR}/vps-commander-hub" "${DOWNLOAD_URL}" || error "下载失败,请检查 Gitea 网络或 Release 是否存在"
chmod +x "${INSTALL_DIR}/vps-commander-hub"
echo -e "\n--- 配置 Hub 参数 ---"
read -rp "请输入监听端口 (默认 9521): " HUB_PORT
HUB_PORT=${HUB_PORT:-9521}
# 自动生成随机凭据
GEN_API_KEY=$(head -c 24 /dev/urandom | xxd -p)
GEN_SECRET=$(head -c 24 /dev/urandom | xxd -p)
GEN_API_KEY=*** -c 24 /dev/urandom | xxd -p)
GEN_SECRET=*** -c 24 /dev/urandom | xxd -p)
GEN_PASS=$(head -c 16 /dev/urandom | xxd -p)
read -rp "请输入 API Key (默认随机生成): " API_KEY
API_KEY=${API_KEY:-$GEN_API_KEY}
API_KEY=***
read -rp "请输入 Cluster Secret (默认随机生成): " CLUSTER_SECRET
CLUSTER_SECRET=${CLUSTER_SECRET:-$GEN_SECRET}
CLUSTER_SECRET=${CLUS…RET}
read -rp "请输入 Web 管理面板密码 (默认随机生成): " WEB_PASS
WEB_PASS=${WEB_PASS:-$GEN_PASS}
cat << ENV > "${CONF_DIR}/hub.env"
VPS_COMMANDER_API_KEY=${API_KEY}
VPS_COMMANDER_CLUSTER_SECRET=${CLUSTER_SECRET}
VPS_COMMANDER_WEB_PASSWORD=${WEB_PASS}
VPS_COMMANDER_API_KEY=***
VPS_COMMANDER_CLUSTER_SECRET=***
VPS_COMMANDER_WEB_PASSWORD=***
ENV
chmod 0600 "${CONF_DIR}/hub.env"
+10 -9
View File
@@ -2,11 +2,12 @@
set -e
# VPS-Commander Agent 一键安全升级脚本
# Repo: https://github.com/kyaring/vps-commander
# Repo: https://gitea.king.nyc.mn/openclaw/vps-commander
REPO="kyaring/vps-commander"
GITEA_HOST="gitea.king.nyc.mn"
REPO="openclaw/vps-commander"
INSTALL_DIR="/opt/vps-commander"
GITHUB_URL="https://github.com"
GITEA_URL="https://gitea.king.nyc.mn"
# 颜色输出
RED='\033[0;31m'
@@ -37,20 +38,20 @@ case "$ARCH" in
esac
info "正在获取最新 Release 版本信息..."
LATEST_TAG=$(curl -fsSL -k "https://api.github.com/repos/${REPO}/releases/latest" | grep '"tag_name":' | head -n1 | sed -E 's/.*"([^"]+)".*/\1/')
LATEST_TAG=$(curl -fsSL -k "${GITEA_URL}/api/v1/repos/${REPO}/releases/latest" 2>/dev/null | grep '"tag_name":' | head -n1 | sed -E 's/.*"([^"]+)".*/\1/')
if [ -z "$LATEST_TAG" ]; then
warn "无法通过 GitHub API 自动获取 Tag,回退至 v1.1.0"
LATEST_TAG="v1.1.0"
warn "无法通过 Gitea API 自动获取 Tag,回退至 v1.1.5"
LATEST_TAG="v1.1.5"
fi
info "目标升级版本: ${LATEST_TAG} (${TARGET_ARCH})"
BIN_NAME="vps-commander-agent-linux-${TARGET_ARCH}"
DOWNLOAD_URL="${GITHUB_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
DOWNLOAD_URL="${GITEA_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
TMP_BIN="${INSTALL_DIR}/vps-commander-agent.tmp"
BAK_BIN="${INSTALL_DIR}/vps-commander-agent.bak"
info "正在下载新版本二进制文件..."
curl -fsSL -k -o "${TMP_BIN}" "${DOWNLOAD_URL}" || error "下载失败,请检查网络或 Release 是否存在"
info "正在从 Gitea 下载新版本二进制文件..."
curl -fsSL -k -o "${TMP_BIN}" "${DOWNLOAD_URL}" || error "下载失败,请检查 Gitea 网络或 Release 是否存在"
# 完整性校验:文件大小不能小于 1MB
FILE_SIZE=$(stat -c%s "${TMP_BIN}" 2>/dev/null || stat -f%z "${TMP_BIN}" 2>/dev/null || echo 0)