Compare commits
3
Commits
v1.1.3
..
46af20e96c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
46af20e96c | ||
|
|
c3114492bb | ||
|
|
ff04cb0c1a |
@@ -53,9 +53,9 @@ jobs:
|
|||||||
NOTES
|
NOTES
|
||||||
|
|
||||||
if [ -n "$PREV_TAG" ]; then
|
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
|
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
|
fi
|
||||||
|
|
||||||
echo "" >> release_notes.md
|
echo "" >> release_notes.md
|
||||||
|
|||||||
@@ -76,21 +76,32 @@
|
|||||||
## 🚀 极速一键部署与平滑升级
|
## 🚀 极速一键部署与平滑升级
|
||||||
|
|
||||||
### 1. 一键全自动安装 (推荐)
|
### 1. 一键全自动安装 (推荐)
|
||||||
无论是在受控端 VPS 还是中心端,只需一行命令即可交互式安装与启动:
|
无论是在受控端 VPS 还是中心端,只需一行命令即可交互式安装与启动。脚本内置 **GitHub + Gitea 双源智能探测与自动容灾互备**,证书异常或 GitHub 网络受阻时自动切换:
|
||||||
|
|
||||||
```bash
|
- **从 GitHub 源安装(国际节点推荐)**:
|
||||||
bash <(curl -sSL https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/install.sh)
|
```bash
|
||||||
```
|
bash <(curl -fsSLk https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/install.sh)
|
||||||
- **安装 Agent (受控 VPS)**:输入 Hub 的 WSS 地址与通信密钥,全自动配置开机自启并秒级连入集群。
|
```
|
||||||
- **安装 Hub (中心服务端)**:自动生成安全 API Key / Web 面板密码并以 Systemd 托管常驻。
|
- **从 Gitea 源安装(国内/内网/自签名节点推荐)**:
|
||||||
|
```bash
|
||||||
|
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 托管常驻。
|
||||||
|
|
||||||
### 2. 受控端 Agent 一键平滑升级 (免重输配置)
|
### 2. 受控端 Agent 一键平滑升级 (免重输配置)
|
||||||
当新版本发布后,无需重新配置通信密钥或重新安装,在任意受控机上直接运行升级脚本:
|
当新版本发布后,无需重新配置通信密钥或重新安装,在任意受控机上直接运行升级脚本(自动双源检测):
|
||||||
|
|
||||||
```bash
|
- **GitHub 源一键升级**:
|
||||||
curl -fsSL https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/upgrade-agent.sh | bash
|
```bash
|
||||||
```
|
curl -fsSLk https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/upgrade-agent.sh | bash
|
||||||
- 自动检测并拉取 GitHub 最新版本架构包(AMD64 / ARM64);
|
```
|
||||||
|
- **Gitea 源一键升级**:
|
||||||
|
```bash
|
||||||
|
curl -fsSLk https://gitea.king.nyc.mn/openclaw/vps-commander/raw/branch/main/deploy/upgrade-agent.sh | bash
|
||||||
|
```
|
||||||
|
- 自动检测并拉取对应架构包(AMD64 / ARM64);
|
||||||
- 自动备份旧版本二进制(`.bak`);
|
- 自动备份旧版本二进制(`.bak`);
|
||||||
- 升级异常(校验失败或无法启动)时**自动秒级回滚**,保证节点永不失联。
|
- 升级异常(校验失败或无法启动)时**自动秒级回滚**,保证节点永不失联。
|
||||||
|
|
||||||
@@ -150,20 +161,51 @@ Agent 启动后会通过 WSS 自动连入 Hub,在 Hub 管理面板与 `/api/v1
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 🤖 接入 ChatGPT / AI 客户端
|
## 🤖 接入 ChatGPT (新版插件 Apps & MCP 模式)
|
||||||
|
|
||||||
### 方式 1:ChatGPT Actions (推荐)
|
当前 ChatGPT 已升级为以 **插件 / 应用 (Apps & MCP)** 规范连接外部服务。VPS-Commander 原生内置完整的 **MCP SSE + OAuth2** 协议支持,无需部署额外适配层。
|
||||||
1. 在 ChatGPT 创建自定义 GPT(GPT Builder)-> **Actions** -> **Create new action**。
|
|
||||||
2. **Schema 导入**:在 `Import from URL` 填入 `https://your-domain.com/openapi.json`。
|
|
||||||
3. **Authentication (身份验证)**:
|
|
||||||
- Authentication Type 选择 **API Key**。
|
|
||||||
- Auth Type 选择 **Bearer**。
|
|
||||||
- 填入你配置的 `VPS_COMMANDER_API_KEY`。
|
|
||||||
|
|
||||||
### 方式 2:MCP (Model Context Protocol)
|
### 接入配置步骤:
|
||||||
- **SSE 端点**:`https://your-domain.com/mcp/sse`
|
|
||||||
- **消息交互**:`https://your-domain.com/mcp/message`
|
1. **进入 ChatGPT 插件/应用配置页**:
|
||||||
- **认证**:支持 URL 参数 `?token=...` 或标准 Header `Authorization: Bearer <TOKEN>`。
|
- 打开 ChatGPT -> **Settings (设置)** -> **Apps & Integrations (应用与集成) / Plugins** -> **Create / Add App (添加应用)**。
|
||||||
|
2. **连接方式选择 MCP**:
|
||||||
|
- 连接协议选择 **MCP (Model Context Protocol)** 或 **Server-Sent Events (SSE)**。
|
||||||
|
- **MCP Server URL**:填入 Hub 的 SSE 统一入口:
|
||||||
|
```text
|
||||||
|
https://your-domain.com/mcp/sse
|
||||||
|
```
|
||||||
|
3. **身份认证 (Authentication)**:
|
||||||
|
- **方式 A (OAuth 2.0 自动授权,推荐)**:
|
||||||
|
- Hub 内置了标准 RFC 8414 OAuth Metadata (`/.well-known/oauth-authorization-server`);
|
||||||
|
- 授权端点与 Token 端点由 ChatGPT 自动识别,一键点击「Authorize」即可完成免密安全绑定。
|
||||||
|
- **方式 B (Bearer API Key)**:
|
||||||
|
- 若选择 API Key,填入 Hub 环境变量 `VPS_COMMANDER_API_KEY` 即可。
|
||||||
|
4. **自动发现 4 大运维工具**:
|
||||||
|
- 握手成功后,ChatGPT 会自动加载并列出 4 个原生运维工具:
|
||||||
|
- `list_devices`:列出受控节点、CPU/内存/磁盘剩余绝对值及 Docker 状态;
|
||||||
|
- `exec_command`:在目标机器(如 `m4-live-agent`)执行 Shell 指令;
|
||||||
|
- `read_file`:分页读取目标文件;
|
||||||
|
- `write_file`:远程编辑或创建文件。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### 传统客户端支持 (Claude Desktop / Cursor / VS Code)
|
||||||
|
|
||||||
|
支持通过本地 stdio 二进制连接 Hub:
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"mcpServers": {
|
||||||
|
"vps-commander": {
|
||||||
|
"command": "/path/to/vps-commander-mcp-stdio-linux-amd64",
|
||||||
|
"args": [
|
||||||
|
"-hub", "https://your-domain.com",
|
||||||
|
"-key", "YOUR_API_KEY"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
+40
-19
@@ -2,12 +2,14 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
# VPS-Commander 一键安装与配置脚本 (Hub / Agent)
|
# VPS-Commander 一键安装与配置脚本 (Hub / Agent)
|
||||||
# Repo: https://github.com/kyaring/vps-commander
|
# 支持 GitHub Release 与 Gitea 多源智能下载及自动故障切换
|
||||||
|
|
||||||
|
GITHUB_REPO="kyaring/vps-commander"
|
||||||
|
GITEA_HOST="gitea.king.nyc.mn"
|
||||||
|
GITEA_REPO="openclaw/vps-commander"
|
||||||
|
|
||||||
REPO="kyaring/vps-commander"
|
|
||||||
INSTALL_DIR="/opt/vps-commander"
|
INSTALL_DIR="/opt/vps-commander"
|
||||||
CONF_DIR="/etc/vps-commander"
|
CONF_DIR="/etc/vps-commander"
|
||||||
GITHUB_URL="https://github.com"
|
|
||||||
|
|
||||||
# 颜色输出
|
# 颜色输出
|
||||||
RED='\033[0;31m'
|
RED='\033[0;31m'
|
||||||
@@ -35,18 +37,44 @@ esac
|
|||||||
# 检查基础依赖
|
# 检查基础依赖
|
||||||
command -v curl >/dev/null 2>&1 || (apt-get update && apt-get install -y curl || yum install -y curl)
|
command -v curl >/dev/null 2>&1 || (apt-get update && apt-get install -y curl || yum install -y curl)
|
||||||
|
|
||||||
# 获取最新版本 tag
|
# 动态解析最新版本 Tag
|
||||||
info "正在获取 VPS-Commander 最新版本信息..."
|
info "正在获取最新 Release 版本信息..."
|
||||||
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 --connect-timeout 4 "https://api.github.com/repos/${GITHUB_REPO}/releases/latest" 2>/dev/null | grep '"tag_name":' | head -n1 | sed -E 's/.*"([^"]+)".*/\1/')
|
||||||
if [ -z "$LATEST_TAG" ]; then
|
if [ -z "$LATEST_TAG" ]; then
|
||||||
warn "无法通过 GitHub API 自动获取 Tag,将尝试使用默认版本 v1.0.0"
|
warn "无法通过 GitHub API 获取 Tag,回退至稳定基线版本 v1.1.5"
|
||||||
LATEST_TAG="v1.0.0"
|
LATEST_TAG="v1.1.5"
|
||||||
fi
|
fi
|
||||||
info "检测到最新版本: ${LATEST_TAG}"
|
info "目标安装版本: ${LATEST_TAG} (${TARGET_ARCH})"
|
||||||
|
|
||||||
mkdir -p "$INSTALL_DIR" "$INSTALL_DIR/data" "$CONF_DIR"
|
mkdir -p "$INSTALL_DIR" "$INSTALL_DIR/data" "$CONF_DIR"
|
||||||
chmod 750 "$INSTALL_DIR" "$CONF_DIR"
|
chmod 750 "$INSTALL_DIR" "$CONF_DIR"
|
||||||
|
|
||||||
|
# 智能多源下载函数(支持 GitHub 与 Gitea 自动容灾互备)
|
||||||
|
download_binary() {
|
||||||
|
local BIN_NAME="$1"
|
||||||
|
local TARGET_FILE="$2"
|
||||||
|
|
||||||
|
local GITHUB_URL="https://github.com/${GITHUB_REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
|
||||||
|
local GITEA_URL="https://${GITEA_HOST}/${GITEA_REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
|
||||||
|
|
||||||
|
# 判断是否优先使用 Gitea(如果脚本调用来源为 Gitea 或显式指定 USE_GITEA=1)
|
||||||
|
if [[ "$DOWNLOAD_SOURCE" == "gitea" ]] || [[ "$USE_GITEA" == "1" ]]; then
|
||||||
|
info "正在从私有源 Gitea 下载: ${GITEA_URL}"
|
||||||
|
if curl -fsSL -k --connect-timeout 8 -o "${TARGET_FILE}" "${GITEA_URL}"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
warn "Gitea 源下载失败,尝试回退至 GitHub 源..."
|
||||||
|
fi
|
||||||
|
|
||||||
|
info "正在从 GitHub 下载: ${GITHUB_URL}"
|
||||||
|
if curl -fsSL -k --connect-timeout 8 -o "${TARGET_FILE}" "${GITHUB_URL}"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
warn "GitHub 下载失败或超时,自动切换至 Gitea 备用源: ${GITEA_URL}"
|
||||||
|
curl -fsSL -k -o "${TARGET_FILE}" "${GITEA_URL}" || error "所有源下载均失败,请检查网络连接!"
|
||||||
|
}
|
||||||
|
|
||||||
select_mode() {
|
select_mode() {
|
||||||
echo -e "\n请选择安装模式:"
|
echo -e "\n请选择安装模式:"
|
||||||
echo "1) 安装受控端 Agent (推荐:在受控 VPS 上一键连入集群)"
|
echo "1) 安装受控端 Agent (推荐:在受控 VPS 上一键连入集群)"
|
||||||
@@ -58,10 +86,8 @@ select_mode() {
|
|||||||
install_agent() {
|
install_agent() {
|
||||||
info "开始安装 VPS-Commander Agent (${TARGET_ARCH})..."
|
info "开始安装 VPS-Commander Agent (${TARGET_ARCH})..."
|
||||||
BIN_NAME="vps-commander-agent-linux-${TARGET_ARCH}"
|
BIN_NAME="vps-commander-agent-linux-${TARGET_ARCH}"
|
||||||
DOWNLOAD_URL="${GITHUB_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
|
|
||||||
|
download_binary "${BIN_NAME}" "${INSTALL_DIR}/vps-commander-agent"
|
||||||
info "正在下载 Agent: ${DOWNLOAD_URL}"
|
|
||||||
curl -fsSL -k -o "${INSTALL_DIR}/vps-commander-agent" "${DOWNLOAD_URL}" || error "下载失败,请检查网络或 Release 是否存在"
|
|
||||||
chmod +x "${INSTALL_DIR}/vps-commander-agent"
|
chmod +x "${INSTALL_DIR}/vps-commander-agent"
|
||||||
|
|
||||||
echo -e "\n--- 配置 Agent 参数 ---"
|
echo -e "\n--- 配置 Agent 参数 ---"
|
||||||
@@ -77,7 +103,6 @@ install_agent() {
|
|||||||
read -rp "Cluster Secret 不能为空,请重新输入: " CLUSTER_SECRET
|
read -rp "Cluster Secret 不能为空,请重新输入: " CLUSTER_SECRET
|
||||||
done
|
done
|
||||||
|
|
||||||
# 写入凭据文件
|
|
||||||
cat << ENV > "${CONF_DIR}/agent.env"
|
cat << ENV > "${CONF_DIR}/agent.env"
|
||||||
VPS_COMMANDER_HUB_WS_URL=${HUB_WS}
|
VPS_COMMANDER_HUB_WS_URL=${HUB_WS}
|
||||||
VPS_COMMANDER_AGENT_NAME=${AGENT_NAME}
|
VPS_COMMANDER_AGENT_NAME=${AGENT_NAME}
|
||||||
@@ -85,7 +110,6 @@ VPS_COMMANDER_CLUSTER_SECRET=${CLUSTER_SECRET}
|
|||||||
ENV
|
ENV
|
||||||
chmod 0600 "${CONF_DIR}/agent.env"
|
chmod 0600 "${CONF_DIR}/agent.env"
|
||||||
|
|
||||||
# 配置 systemd
|
|
||||||
cat << SVC > /etc/systemd/system/vps-commander-agent.service
|
cat << SVC > /etc/systemd/system/vps-commander-agent.service
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=VPS-Commander Agent
|
Description=VPS-Commander Agent
|
||||||
@@ -125,17 +149,14 @@ SVC
|
|||||||
install_hub() {
|
install_hub() {
|
||||||
info "开始安装 VPS-Commander Hub (${TARGET_ARCH})..."
|
info "开始安装 VPS-Commander Hub (${TARGET_ARCH})..."
|
||||||
BIN_NAME="vps-commander-hub-linux-${TARGET_ARCH}"
|
BIN_NAME="vps-commander-hub-linux-${TARGET_ARCH}"
|
||||||
DOWNLOAD_URL="${GITHUB_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
|
|
||||||
|
|
||||||
info "正在下载 Hub: ${DOWNLOAD_URL}"
|
download_binary "${BIN_NAME}" "${INSTALL_DIR}/vps-commander-hub"
|
||||||
curl -fsSL -k -o "${INSTALL_DIR}/vps-commander-hub" "${DOWNLOAD_URL}" || error "下载失败,请检查网络或 Release 是否存在"
|
|
||||||
chmod +x "${INSTALL_DIR}/vps-commander-hub"
|
chmod +x "${INSTALL_DIR}/vps-commander-hub"
|
||||||
|
|
||||||
echo -e "\n--- 配置 Hub 参数 ---"
|
echo -e "\n--- 配置 Hub 参数 ---"
|
||||||
read -rp "请输入监听端口 (默认 9521): " HUB_PORT
|
read -rp "请输入监听端口 (默认 9521): " HUB_PORT
|
||||||
HUB_PORT=${HUB_PORT:-9521}
|
HUB_PORT=${HUB_PORT:-9521}
|
||||||
|
|
||||||
# 自动生成随机凭据
|
|
||||||
GEN_API_KEY=$(head -c 24 /dev/urandom | xxd -p)
|
GEN_API_KEY=$(head -c 24 /dev/urandom | xxd -p)
|
||||||
GEN_SECRET=$(head -c 24 /dev/urandom | xxd -p)
|
GEN_SECRET=$(head -c 24 /dev/urandom | xxd -p)
|
||||||
GEN_PASS=$(head -c 16 /dev/urandom | xxd -p)
|
GEN_PASS=$(head -c 16 /dev/urandom | xxd -p)
|
||||||
|
|||||||
+17
-9
@@ -1,12 +1,14 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# VPS-Commander Agent 一键安全升级脚本
|
# VPS-Commander Agent 一键平滑安全升级脚本
|
||||||
# Repo: https://github.com/kyaring/vps-commander
|
# 支持 GitHub Release 与 Gitea 多源智能下载及自动故障切换
|
||||||
|
|
||||||
|
GITHUB_REPO="kyaring/vps-commander"
|
||||||
|
GITEA_HOST="gitea.king.nyc.mn"
|
||||||
|
GITEA_REPO="openclaw/vps-commander"
|
||||||
|
|
||||||
REPO="kyaring/vps-commander"
|
|
||||||
INSTALL_DIR="/opt/vps-commander"
|
INSTALL_DIR="/opt/vps-commander"
|
||||||
GITHUB_URL="https://github.com"
|
|
||||||
|
|
||||||
# 颜色输出
|
# 颜色输出
|
||||||
RED='\033[0;31m'
|
RED='\033[0;31m'
|
||||||
@@ -37,20 +39,26 @@ case "$ARCH" in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
info "正在获取最新 Release 版本信息..."
|
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 --connect-timeout 4 "https://api.github.com/repos/${GITHUB_REPO}/releases/latest" 2>/dev/null | grep '"tag_name":' | head -n1 | sed -E 's/.*"([^"]+)".*/\1/')
|
||||||
if [ -z "$LATEST_TAG" ]; then
|
if [ -z "$LATEST_TAG" ]; then
|
||||||
warn "无法通过 GitHub API 自动获取 Tag,回退至 v1.1.0"
|
warn "无法通过 GitHub API 获取 Tag,回退至稳定版本 v1.1.5"
|
||||||
LATEST_TAG="v1.1.0"
|
LATEST_TAG="v1.1.5"
|
||||||
fi
|
fi
|
||||||
info "目标升级版本: ${LATEST_TAG} (${TARGET_ARCH})"
|
info "目标升级版本: ${LATEST_TAG} (${TARGET_ARCH})"
|
||||||
|
|
||||||
BIN_NAME="vps-commander-agent-linux-${TARGET_ARCH}"
|
BIN_NAME="vps-commander-agent-linux-${TARGET_ARCH}"
|
||||||
DOWNLOAD_URL="${GITHUB_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
|
|
||||||
TMP_BIN="${INSTALL_DIR}/vps-commander-agent.tmp"
|
TMP_BIN="${INSTALL_DIR}/vps-commander-agent.tmp"
|
||||||
BAK_BIN="${INSTALL_DIR}/vps-commander-agent.bak"
|
BAK_BIN="${INSTALL_DIR}/vps-commander-agent.bak"
|
||||||
|
|
||||||
|
GITHUB_URL="https://github.com/${GITHUB_REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
|
||||||
|
GITEA_URL="https://${GITEA_HOST}/${GITEA_REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
|
||||||
|
|
||||||
info "正在下载新版本二进制文件..."
|
info "正在下载新版本二进制文件..."
|
||||||
curl -fsSL -k -o "${TMP_BIN}" "${DOWNLOAD_URL}" || error "下载失败,请检查网络或 Release 是否存在"
|
# 优先尝试 GitHub,失败自动切换 Gitea
|
||||||
|
if ! curl -fsSL -k --connect-timeout 8 -o "${TMP_BIN}" "${GITHUB_URL}"; then
|
||||||
|
warn "GitHub 下载失败或超时,自动切换至 Gitea 私有镜像下载..."
|
||||||
|
curl -fsSL -k -o "${TMP_BIN}" "${GITEA_URL}" || error "所有源下载均失败,请检查网络"
|
||||||
|
fi
|
||||||
|
|
||||||
# 完整性校验:文件大小不能小于 1MB
|
# 完整性校验:文件大小不能小于 1MB
|
||||||
FILE_SIZE=$(stat -c%s "${TMP_BIN}" 2>/dev/null || stat -f%z "${TMP_BIN}" 2>/dev/null || echo 0)
|
FILE_SIZE=$(stat -c%s "${TMP_BIN}" 2>/dev/null || stat -f%z "${TMP_BIN}" 2>/dev/null || echo 0)
|
||||||
|
|||||||
Reference in New Issue
Block a user