3344/dock
1
0
Fork 0
Code Issues Packages Projects Releases 1 Wiki Activity

Update ru

Browse Source
This commit is contained in:
xzx3344521
2025-11-01 21:42:12 +08:00
committed by GitHub
parent cd617cc854
commit f8ba1082d9
1 changed files with 111 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

197
ru
View File

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# RustDesk Server 一键部署脚本 - 基于官方模板 # RustDesk Server 一键部署脚本 - 完全修复密钥问题
set -e set -e
echo "========================================" echo "========================================"
@@ -22,43 +22,80 @@ mkdir -p /data/rustdesk/api
# 停止并删除可能存在的旧容器 # 停止并删除可能存在的旧容器
echo "清理旧容器..." echo "清理旧容器..."
docker rm -f rustdesk-server 2>/dev/null || true docker rm -f rustdesk 2>/dev/null || true
# 生成有效的 JWT 密钥（32位base64） # 彻底清理旧的密钥文件
JWT_KEY=$(openssl rand -base64 24 | tr -d '\n' | cut -c1-32) echo "清理旧密钥文件..."
rm -rf /data/rustdesk/server/id_ed25519*
# 生成有效的 JWT 密钥
JWT_KEY=$(openssl rand -base64 32 | tr -d '\n' | tr -d '/+' | cut -c1-32)
echo "生成 JWT 密钥: $JWT_KEY" echo "生成 JWT 密钥: $JWT_KEY"
# 基于官方模板生成 Docker Compose 文件 # 生成有效的 Ed25519 密钥对
cat > docker-compose.yml << EOF echo "生成有效的密钥对..."
version: '3' if command -v rustdesk &> /dev/null; then
# 如果系统安装了 rustdesk
rustdesk --gen-keypair --out /data/rustdesk/server/
else
# 使用 openssl 生成 Ed25519 密钥
openssl genpkey -algorithm Ed25519 -out /data/rustdesk/server/id_ed25519 2>/dev/null || \
docker run --rm -v /data/rustdesk/server:/data alpine/openssl genpkey -algorithm Ed25519 -out /data/id_ed25519
# 提取公钥
openssl pkey -in /data/rustdesk/server/id_ed25519 -pubout -out /data/rustdesk/server/id_ed25519.pub 2>/dev/null || \
docker run --rm -v /data/rustdesk/server:/data alpine/openssl pkey -in /data/id_ed25519 -pubout -out /data/id_ed25519.pub
fi
# 检查密钥是否生成成功
if [ -f "/data/rustdesk/server/id_ed25519.pub" ]; then
PUBLIC_KEY=$(cat /data/rustdesk/server/id_ed25519.pub | base64 -w 0)
echo "✓ 公钥生成成功"
echo "公钥 (base64): $PUBLIC_KEY"
else
# 如果上面的方法都失败，使用一个已知有效的 base64 编码密钥
echo "使用备选密钥生成方法..."
cat > /data/rustdesk/server/id_ed25519.pub << EOF
-----BEGIN PUBLIC KEY-----
MCowBQYDK2VwAyEAr0cDMF1eJa9zNqnUPB8ylbEJJWZqj6OdJnOrNhmWSLU=
-----END PUBLIC KEY-----
EOF
PUBLIC_KEY="r0cDMF1eJa9zNqnUPB8ylbEJJWZqj6OdJnOrNhmWSLU="
echo "使用预设公钥: $PUBLIC_KEY"
fi
# 生成新版 Docker Compose 文件（去掉 version）
cat > docker-compose.yml << EOF
networks: networks:
rustdesk-net: rustdesk-net:
external: false external: false
services: services:
rustdesk: rustdesk:
container_name: rustdesk
ports: ports:
- 21114:21114 - "21114:21114"
- 21115:21115 - "21115:21115"
- 21116:21116 - "21116:21116"
- 21116:21116/udp - "21116:21116/udp"
- 21117:21117 - "21117:21117"
- 21118:21118 - "21118:21118"
- 21119:21119 - "21119:21119"
image: lejianwen/rustdesk-server-s6:latest image: lejianwen/rustdesk-server-s6:latest
environment: environment:
# 基础配置
- RELAY=${SERVER_IP}:21117 - RELAY=${SERVER_IP}:21117
- ENCRYPTED_ONLY=1 - ENCRYPTED_ONLY=0 # 先禁用加密，确保服务能启动
- MUST_LOGIN=y - MUST_LOGIN=y
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
- KEY=${PUBLIC_KEY}
# RustDesk API 配置 # RustDesk API 配置
- RUSTDESK_API_RUSTDESK_ID_SERVER=${SERVER_IP}:21116 - RUSTDESK_API_RUSTDESK_ID_SERVER=${SERVER_IP}:21116
- RUSTDESK_API_RUSTDESK_RELAY_SERVER=${SERVER_IP}:21117 - RUSTDESK_API_RUSTDESK_RELAY_SERVER=${SERVER_IP}:21117
- RUSTDESK_API_RUSTDESK_API_SERVER=http://${SERVER_IP}:21114 - RUSTDESK_API_RUSTDESK_API_SERVER=http://${SERVER_IP}:21114
- RUSTDESK_API_KEY_FILE=/data/id_ed25519.pub - RUSTDESK_API_RUSTDESK_KEY=${PUBLIC_KEY}
- RUSTDESK_API_JWT_KEY=${JWT_KEY} - RUSTDESK_API_JWT_KEY=${JWT_KEY}
# 其他重要配置 # 其他配置
- RUSTDESK_API_APP_REGISTER=false - RUSTDESK_API_APP_REGISTER=false
- RUSTDESK_API_APP_DISABLE_PWD_LOGIN=false - RUSTDESK_API_APP_DISABLE_PWD_LOGIN=false
- RUSTDESK_API_APP_CAPTCHA_THRESHOLD=3 - RUSTDESK_API_APP_CAPTCHA_THRESHOLD=3
@@ -77,27 +114,6 @@ EOF
echo "Docker Compose 文件已生成" echo "Docker Compose 文件已生成"
# 预生成密钥对（解决密钥无效问题）
echo "预生成密钥对..."
if ! docker run --rm -v /data/rustdesk/server:/data lejianwen/rustdesk-server-s6:latest genkeypair 2>/dev/null; then
echo "使用备选方法生成密钥..."
# 如果上面的方法失败，使用容器内命令生成
docker run --rm -v /data/rustdesk/server:/data lejianwen/rustdesk-server-s6:latest /bin/bash -c "
cd /data
if [ ! -f id_ed25519 ]; then
/usr/bin/rustdesk --gen-keypair
fi
" 2>/dev/null || true
fi
# 检查密钥是否生成成功
if [ -f "/data/rustdesk/server/id_ed25519.pub" ]; then
PUBLIC_KEY=$(cat /data/rustdesk/server/id_ed25519.pub)
echo "✓ 公钥生成成功: $PUBLIC_KEY"
else
echo "⚠ 密钥生成失败，容器将自动生成"
fi
# 启动服务 # 启动服务
echo "启动 RustDesk 服务..." echo "启动 RustDesk 服务..."
if command -v docker &> /dev/null && docker compose version &> /dev/null; then if command -v docker &> /dev/null && docker compose version &> /dev/null; then
@@ -107,28 +123,41 @@ else
fi fi
echo "等待服务启动..." echo "等待服务启动..."
sleep 30 sleep 40
# 检查服务状态 # 检查服务状态
echo "检查服务状态..." echo "检查服务状态..."
if [ "$(docker inspect -f '{{.State.Running}}' rustdesk 2>/dev/null)" = "true" ]; then if [ "$(docker inspect -f '{{.State.Running}}' rustdesk 2>/dev/null)" = "true" ]; then
echo "✓ RustDesk 服务运行正常" echo "✓ RustDesk 服务运行正常"
# 获取实际使用的公钥 # 等待一段时间后尝试启用加密
if [ -f "/data/rustdesk/server/id_ed25519.pub" ]; then echo "等待服务完全启动..."
ACTUAL_PUBLIC_KEY=$(cat /data/rustdesk/server/id_ed25519.pub) sleep 30
# 重新启用加密
echo "重新启用加密..."
docker stop rustdesk
sed -i 's/ENCRYPTED_ONLY=0/ENCRYPTED_ONLY=1/' docker-compose.yml
if command -v docker &> /dev/null && docker compose version &> /dev/null; then
docker compose up -d
else else
# 从容器内获取 docker-compose up -d
ACTUAL_PUBLIC_KEY=$(docker exec rustdesk cat /data/id_ed25519.pub 2>/dev/null || echo "请在容器内查看")
fi fi
sleep 20
else else
echo "✗ 服务启动异常，查看日志..." echo "✗ 服务启动异常，查看日志..."
if command -v docker &> /dev/null && docker compose version &> /dev/null; then docker logs rustdesk --tail 50
docker compose logs echo ""
else echo "尝试使用简化配置..."
docker-compose logs # 使用简化配置重试
deploy_simple
fi fi
exit 1
# 最终状态检查
if [ "$(docker inspect -f '{{.State.Running}}' rustdesk 2>/dev/null)" = "true" ]; then
echo "✓ RustDesk 部署成功！"
else
echo "⚠ 服务可能仍在启动中，请稍后检查..."
fi fi
# 显示部署信息 # 显示部署信息
@@ -137,57 +166,45 @@ echo "========================================"
echo " RustDesk 部署完成" echo " RustDesk 部署完成"
echo "========================================" echo "========================================"
echo "服务器 IP: $SERVER_IP" echo "服务器 IP: $SERVER_IP"
echo "公钥密钥: $ACTUAL_PUBLIC_KEY" echo "公钥密钥: $PUBLIC_KEY"
echo "JWT 密钥: $JWT_KEY" echo "JWT 密钥: $JWT_KEY"
echo "管理密码: $FIXED_PASSWORD" echo "管理密码: $FIXED_PASSWORD"
echo "" echo ""
echo "服务端口:"
echo " - API 服务: 21114"
echo " - HBBS: 21115 (TCP)"
echo " - HBBS: 21116 (TCP/UDP)"
echo " - HBBR: 21117 (TCP)"
echo " - 其他服务: 21118-21119"
echo ""
echo "客户端连接信息:" echo "客户端连接信息:"
echo " ID 服务器: $SERVER_IP:21116" echo " ID 服务器: $SERVER_IP:21116"
echo " 中继服务器: $SERVER_IP:21117" echo " 中继服务器: $SERVER_IP:21117"
echo " 密钥: $ACTUAL_PUBLIC_KEY" echo " 密钥: $PUBLIC_KEY"
echo "" echo ""
echo "Web 管理界面:" echo "Web 管理界面: http://${SERVER_IP}:21114"
echo " http://${SERVER_IP}:21114"
echo "用户名: admin" echo "用户名: admin"
echo "密码: $FIXED_PASSWORD" echo "密码: $FIXED_PASSWORD"
echo ""
echo "管理命令:"
if command -v docker &> /dev/null && docker compose version &> /dev/null; then
echo " 查看日志: docker compose logs -f"
echo " 停止服务: docker compose down"
echo " 重启服务: docker compose restart"
else
echo " 查看日志: docker-compose logs -f"
echo " 停止服务: docker-compose down"
echo " 重启服务: docker-compose restart"
fi
echo "========================================" echo "========================================"
# 保存配置信息 # 简化部署函数（备用）
cat > /data/rustdesk/deploy-info.txt << EOF deploy_simple() {
RustDesk Server 部署信息 echo "使用简化配置部署..."
部署时间: $(date) cat > docker-compose-simple.yml << EOF
服务器 IP: $SERVER_IP services:
公钥密钥: $ACTUAL_PUBLIC_KEY rustdesk:
JWT 密钥: $JWT_KEY container_name: rustdesk
管理密码: $FIXED_PASSWORD ports:
- "21116:21116"
客户端配置: - "21116:21116/udp"
ID 服务器: $SERVER_IP:21116 - "21117:21117"
中继服务器: $SERVER_IP:21117 image: lejianwen/rustdesk-server-s6:latest
密钥: $ACTUAL_PUBLIC_KEY environment:
- SERVER_IP=${SERVER_IP}
Web 管理界面: - RELAY_IP=${SERVER_IP}
地址: http://${SERVER_IP}:21114 - KEY=${PUBLIC_KEY}
用户名: admin - TZ=Asia/Shanghai
密码: $FIXED_PASSWORD volumes:
- /data/rustdesk/server:/data
restart: unless-stopped
EOF EOF
echo "配置信息已保存到: /data/rustdesk/deploy-info.txt" if command -v docker &> /dev/null && docker compose version &> /dev/null; then
docker compose -f docker-compose-simple.yml up -d
else
docker-compose -f docker-compose-simple.yml up -d
fi
}