Compare commits
2
Commits
c3114492bb
...
v1.1.7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
97bbe3ced6 | ||
|
|
46af20e96c |
@@ -79,7 +79,7 @@
|
|||||||
无论是在受控端 VPS 还是中心端,只需一行命令即可交互式安装与启动:
|
无论是在受控端 VPS 还是中心端,只需一行命令即可交互式安装与启动:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
bash <(curl -sSL https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/install.sh)
|
bash <(curl -fsSLk https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/install.sh)
|
||||||
```
|
```
|
||||||
- **安装 Agent (受控 VPS)**:输入 Hub 的 WSS 地址与通信密钥,全自动配置开机自启并秒级连入集群。
|
- **安装 Agent (受控 VPS)**:输入 Hub 的 WSS 地址与通信密钥,全自动配置开机自启并秒级连入集群。
|
||||||
- **安装 Hub (中心服务端)**:自动生成安全 API Key / Web 面板密码并以 Systemd 托管常驻。
|
- **安装 Hub (中心服务端)**:自动生成安全 API Key / Web 面板密码并以 Systemd 托管常驻。
|
||||||
@@ -88,7 +88,7 @@ bash <(curl -sSL https://raw.githubusercontent.com/kyaring/vps-commander/main/de
|
|||||||
当新版本发布后,无需重新配置通信密钥或重新安装,在任意受控机上直接运行升级脚本:
|
当新版本发布后,无需重新配置通信密钥或重新安装,在任意受控机上直接运行升级脚本:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
curl -fsSL https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/upgrade-agent.sh | bash
|
curl -fsSLk https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/upgrade-agent.sh | bash
|
||||||
```
|
```
|
||||||
- 自动检测并拉取 GitHub 最新版本架构包(AMD64 / ARM64);
|
- 自动检测并拉取 GitHub 最新版本架构包(AMD64 / ARM64);
|
||||||
- 自动备份旧版本二进制(`.bak`);
|
- 自动备份旧版本二进制(`.bak`);
|
||||||
|
|||||||
+12
-15
@@ -37,12 +37,12 @@ command -v curl >/dev/null 2>&1 || (apt-get update && apt-get install -y curl ||
|
|||||||
|
|
||||||
# 获取最新版本 tag
|
# 获取最新版本 tag
|
||||||
info "正在获取 VPS-Commander 最新版本信息..."
|
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 "https://api.github.com/repos/${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"
|
||||||
@@ -77,15 +77,13 @@ 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}
|
||||||
VPS_COMMANDER_CLUSTER_SECRET=${CLUSTER_SECRET}
|
VPS_COMMANDER_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
|
||||||
@@ -135,24 +133,23 @@ install_hub() {
|
|||||||
read -rp "请输入监听端口 (默认 9521): " HUB_PORT
|
read -rp "请输入监听端口 (默认 9521): " HUB_PORT
|
||||||
HUB_PORT=${HUB_PORT:-9521}
|
HUB_PORT=${HUB_PORT:-9521}
|
||||||
|
|
||||||
# 自动生成随机凭据
|
GEN_API_KEY=*** -c 24 /dev/urandom | xxd -p)
|
||||||
GEN_API_KEY=$(head -c 24 /dev/urandom | xxd -p)
|
GEN_SECRET=*** -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)
|
||||||
|
|
||||||
read -rp "请输入 API Key (默认随机生成): " API_KEY
|
read -rp "请输入 API Key (默认随机生成): " API_KEY
|
||||||
API_KEY=${API_KEY:-$GEN_API_KEY}
|
API_KEY=***
|
||||||
|
|
||||||
read -rp "请输入 Cluster Secret (默认随机生成): " CLUSTER_SECRET
|
read -rp "请输入 Cluster Secret (默认随机生成): " CLUSTER_SECRET
|
||||||
CLUSTER_SECRET=${CLUSTER_SECRET:-$GEN_SECRET}
|
CLUSTER_SECRET=${CLUS…RET}
|
||||||
|
|
||||||
read -rp "请输入 Web 管理面板密码 (默认随机生成): " WEB_PASS
|
read -rp "请输入 Web 管理面板密码 (默认随机生成): " WEB_PASS
|
||||||
WEB_PASS=${WEB_PASS:-$GEN_PASS}
|
WEB_PASS=${WEB_PASS:-$GEN_PASS}
|
||||||
|
|
||||||
cat << ENV > "${CONF_DIR}/hub.env"
|
cat << ENV > "${CONF_DIR}/hub.env"
|
||||||
VPS_COMMANDER_API_KEY=${API_KEY}
|
VPS_COMMANDER_API_KEY=***
|
||||||
VPS_COMMANDER_CLUSTER_SECRET=${CLUSTER_SECRET}
|
VPS_COMMANDER_CLUSTER_SECRET=***
|
||||||
VPS_COMMANDER_WEB_PASSWORD=${WEB_PASS}
|
VPS_COMMANDER_WEB_PASSWORD=***
|
||||||
ENV
|
ENV
|
||||||
chmod 0600 "${CONF_DIR}/hub.env"
|
chmod 0600 "${CONF_DIR}/hub.env"
|
||||||
|
|
||||||
|
|||||||
@@ -37,10 +37,10 @@ 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 "https://api.github.com/repos/${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})"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user