Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c9e8e113d0 | ||
|
|
354495ec78 |
+49
-5
@@ -4,6 +4,39 @@
|
||||
|
||||
目标机:已解析到 `jxd.jinniu.ink` 的香港测试服务器。数据目录仍是仓库下的 `components/` 与 `data/`,回滚不删数据。
|
||||
|
||||
## 共享服务器铁律(HEL-551)
|
||||
|
||||
这台服务器不止跑金讯达一个项目(还要给 `solsum.cn` 等域名提供服务),所以:
|
||||
|
||||
- 公网 `80/443` 只能由**一套**统一入口持有——现在是系统/宝塔 Nginx,不是某个项目自己的容器。
|
||||
- 新增域名/项目,只在系统 Nginx 里新增一个站点配置文件,不要另起一个监听 80/443 的边缘容器。
|
||||
- 任何业务容器都不允许用 `network_mode: host` 或直接绑 `0.0.0.0:80` / `0.0.0.0:443` 抢占入口端口;容器只把业务端口绑到 `127.0.0.1`,由系统 Nginx 反代。
|
||||
- `jxd-edge`(HEL-279 时代的方案)已经因为这条铁律下线,定义保留在 `docker-compose.edge-fallback.yaml` 仅供应急回滚,不要在日常启动里叠加它。
|
||||
|
||||
## 统一入口:系统 Nginx 取代 jxd-edge
|
||||
|
||||
自 HEL-551 起,`jxd.jinniu.ink` 的 80/443 由服务器上的系统/宝塔 Nginx 直接持有并反代,不再用独占 host 网络的 `jxd-edge` 容器:
|
||||
|
||||
- 站点配置模板:`deploy/public/host-nginx/jxd.jinniu.ink.conf`(1:1 迁移了原 `nginx.conf` 里的全部路由:`/msg_gateway`、`/account/`、`/files/`、`/livekit/`、REST API catch-all、ACME challenge、HTTPS、超时与上传大小限制)。
|
||||
- `docker-compose.public.yaml` 里的 `edge` 服务已删除;金讯达各容器的内部端口本来就只绑 `127.0.0.1`,不受影响。
|
||||
- 切换脚本:`scripts/switch-to-host-nginx.sh`(备份 → 语法检查 → 停旧 edge → 启动/重载系统 Nginx → 健康检查,任一步失败自动回滚)。
|
||||
- 回滚脚本:`scripts/rollback-to-jxd-edge.sh`(禁用系统 Nginx 上的 jxd 站点文件,重新拉起 `jxd-edge`,配合 `deploy/public/docker-compose.edge-fallback.yaml`)。
|
||||
|
||||
切换步骤(总工在服务器上执行,按需通过环境变量覆盖 `HOST_NGINX_VHOST_DIR` / `HOST_NGINX_BIN` / `HOST_NGINX_INIT` 适配实际路径):
|
||||
|
||||
```bash
|
||||
cd /path/to/tongxunruanjian
|
||||
./scripts/switch-to-host-nginx.sh
|
||||
```
|
||||
|
||||
一键回滚(切换失败会自动触发,也可以随时手动执行):
|
||||
|
||||
```bash
|
||||
./scripts/rollback-to-jxd-edge.sh
|
||||
```
|
||||
|
||||
**APK 下载现状核实(HEL-552 复核修正)**:仓库里的旧 `nginx.conf` 曾缺少 APK 下载路由,但线上 `jxd-edge` 实际运行配置里**有** `/downloads/` 路由,并挂载了 `deploy/public/downloads`(HEL-279 验收后现场热修加入,仓库未同步)。已交付验收地址为 `https://jxd.jinniu.ink/downloads/jinxunda-android-test-1.0.9.apk`。现已把 `/downloads/` 路由补进系统 Nginx 站点模板(占位符 `__JXD_DOWNLOADS_DIR__`)、回滚用 `docker-compose.edge-fallback.yaml` 的挂载、以及本仓库 `nginx.conf` 本身,三处与线上一致,切换与回滚后该链接均不失效。
|
||||
|
||||
## 对外暴露与对内绑定
|
||||
|
||||
| 入口 | 协议 | 后端 | 说明 |
|
||||
@@ -19,11 +52,15 @@
|
||||
|
||||
## 证书
|
||||
|
||||
首次签发(历史步骤,测试机已经跑过一次,证书已经存在,仅在证书丢失/重建时才需要重跑):
|
||||
|
||||
1. 先把 `deploy/public/nginx.bootstrap.conf` 挂到 edge(只听 80)。
|
||||
2. `certbot certonly --webroot -w deploy/public/acme -d jxd.jinniu.ink`
|
||||
3. 确认 `/etc/letsencrypt/live/jxd.jinniu.ink/` 有 `fullchain.pem` 与 `privkey.pem`。
|
||||
4. 改回 `nginx.conf` 后重载 edge。
|
||||
|
||||
**HEL-551 后的续期**:系统 Nginx 站点配置(`deploy/public/host-nginx/jxd.jinniu.ink.conf`)里的 ACME challenge `root` 指向的还是同一个 `deploy/public/acme` 目录,`switch-to-host-nginx.sh` 会自动替换成绝对路径。只要 certbot 续期时仍用这个目录做 webroot,就不需要重新申请证书,也不用再依赖 `jxd-edge` 来响应 `.well-known/acme-challenge`。
|
||||
|
||||
私钥不得复制进 Git。
|
||||
|
||||
## 极光 Master Secret
|
||||
@@ -44,17 +81,24 @@ cp .env.example .env # 若还没有
|
||||
# 按 deploy/public/.env.public.example 写入 SERVER_IP、MINIO_EXTERNAL_ADDRESS、JPUSH_*(不含 Master Secret)
|
||||
source ./scripts/load-jpush-secret.sh
|
||||
./scripts/deploy-public.sh
|
||||
./scripts/switch-to-host-nginx.sh # HEL-551 起:让系统 Nginx 接管 80/443
|
||||
```
|
||||
|
||||
`SERVER_IP` 填本机公网 IP(LiveKit 媒体候选),不要写进手机/电脑客户端代码。
|
||||
|
||||
`deploy-public.sh` 本身只拉起金讯达容器(内部端口只绑 `127.0.0.1`),不再包含监听 80/443 的边缘容器;`switch-to-host-nginx.sh` 是让系统 Nginx 对外接管入口这一步,缺了它 `jxd.jinniu.ink` 在公网上访问不到。
|
||||
|
||||
## 回滚
|
||||
|
||||
```bash
|
||||
./scripts/rollback-public.sh
|
||||
```
|
||||
|
||||
效果:停掉 nginx edge,按原来的 `docker-compose.yaml` 拉起;`components/` 与 `data/account` 不动。
|
||||
- 只想让 jxd-edge 重新接管 80/443(系统 Nginx 切换出问题时的应急手段):
|
||||
```bash
|
||||
./scripts/rollback-to-jxd-edge.sh
|
||||
```
|
||||
- 想整体退回内网部署(不对外暴露):
|
||||
```bash
|
||||
./scripts/rollback-public.sh
|
||||
```
|
||||
效果:清理 jxd-edge(如果在跑),按原来的 `docker-compose.yaml` 拉起;`components/` 与 `data/account` 不动。系统 Nginx 上的 jxd 站点文件不受影响,需要的话手工禁用或用 `rollback-to-jxd-edge.sh` 里的第一步。
|
||||
|
||||
## 客户端地址(已写进代码默认值)
|
||||
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
# 应急回滚专用 overlay(HEL-551)——不要在日常启动里叠加这个文件。
|
||||
#
|
||||
# 这里保留的是 HEL-279 时代 jxd-edge 的原始定义:用 host 网络独占 80/443。
|
||||
# 只有在系统/宝塔 Nginx 切换失败、需要立刻恢复公网访问时才用它,配合
|
||||
# scripts/rollback-to-jxd-edge.sh 一起执行:
|
||||
#
|
||||
# docker compose \
|
||||
# -f docker-compose.yaml \
|
||||
# -f deploy/public/docker-compose.public.yaml \
|
||||
# -f deploy/public/docker-compose.edge-fallback.yaml \
|
||||
# up -d edge
|
||||
#
|
||||
# 恢复系统 Nginx 统一入口后,记得停掉并移除这个容器:
|
||||
# docker compose -f docker-compose.yaml -f deploy/public/docker-compose.public.yaml \
|
||||
# -f deploy/public/docker-compose.edge-fallback.yaml stop edge
|
||||
# docker compose -f docker-compose.yaml -f deploy/public/docker-compose.public.yaml \
|
||||
# -f deploy/public/docker-compose.edge-fallback.yaml rm -f edge
|
||||
#
|
||||
# 不得同时有 jxd-edge(host 网络)和系统 Nginx 一起监听 80/443——两者互斥。
|
||||
|
||||
services:
|
||||
edge:
|
||||
image: nginx:1.27-alpine
|
||||
container_name: jxd-edge
|
||||
restart: always
|
||||
network_mode: host
|
||||
volumes:
|
||||
- ./deploy/public/nginx.conf:/etc/nginx/nginx.conf:ro
|
||||
- ./deploy/public/acme:/var/www/acme:ro
|
||||
- ./deploy/public/downloads:/var/www/downloads:ro
|
||||
- /etc/letsencrypt:/etc/letsencrypt:ro
|
||||
depends_on:
|
||||
- openim-server
|
||||
- account-server
|
||||
- minio
|
||||
- livekit
|
||||
@@ -7,6 +7,14 @@
|
||||
# 原则:内部端口只绑 127.0.0.1;对外只开 80/443 + LiveKit 媒体 17881/tcp、17882/udp。
|
||||
# ports 使用 !override,避免与基础 compose 的 0.0.0.0 绑定叠加。
|
||||
# 回滚:去掉本 overlay,改回 docker compose -f docker-compose.yaml up -d,数据目录 components/ 与 data/ 不动。
|
||||
#
|
||||
# HEL-551:80/443 已交给系统/宝塔 Nginx 统一持有,本 overlay 不再包含独占
|
||||
# host 网络的 jxd-edge 容器(这是共享服务器上和其他域名冲突的根因)。
|
||||
# 上面几个服务的内部端口本来就只绑 127.0.0.1,系统 Nginx 直接反代这些端口即可,
|
||||
# 见 deploy/public/host-nginx/jxd.jinniu.ink.conf。
|
||||
# 应急回滚(系统 Nginx 切换失败时)才用得到旧的 edge 容器定义,见
|
||||
# deploy/public/docker-compose.edge-fallback.yaml 与 scripts/rollback-to-jxd-edge.sh,
|
||||
# 不要把 edge-fallback 叠进日常启动命令。
|
||||
|
||||
services:
|
||||
openim-server:
|
||||
@@ -42,18 +50,3 @@ services:
|
||||
account-server:
|
||||
ports: !override
|
||||
- "127.0.0.1:${ACCOUNT_PORT:-10010}:10010"
|
||||
|
||||
edge:
|
||||
image: nginx:1.27-alpine
|
||||
container_name: jxd-edge
|
||||
restart: always
|
||||
network_mode: host
|
||||
volumes:
|
||||
- ./deploy/public/nginx.conf:/etc/nginx/nginx.conf:ro
|
||||
- ./deploy/public/acme:/var/www/acme:ro
|
||||
- /etc/letsencrypt:/etc/letsencrypt:ro
|
||||
depends_on:
|
||||
- openim-server
|
||||
- account-server
|
||||
- minio
|
||||
- livekit
|
||||
|
||||
@@ -0,0 +1,139 @@
|
||||
# jxd.jinniu.ink 站点配置 —— 给系统/宝塔 Nginx 用(HEL-551)。
|
||||
#
|
||||
# 用途:把这个文件放进系统 Nginx 的站点目录(宝塔一般是
|
||||
# /www/server/panel/vhost/nginx/,原生 Nginx 一般是 /etc/nginx/conf.d/),
|
||||
# 让系统 Nginx 作为 80/443 的唯一持有者,替换掉原来独占 host 网络的
|
||||
# jxd-edge 容器。不要整份替换系统 Nginx 的 nginx.conf,这里只是新增一个
|
||||
# 站点文件,和 solsum.cn 等其他站点的配置文件平级共存。
|
||||
#
|
||||
# 使用前必须替换的占位符:
|
||||
# __JXD_ACME_WEBROOT__ -> 本机 tongxunruanjian 仓库的绝对路径 + /deploy/public/acme
|
||||
# (例如 /opt/tongxunruanjian/deploy/public/acme)。
|
||||
# 这必须是 certbot 当初签发 jxd.jinniu.ink 证书时用的同一个
|
||||
# webroot 目录,这样证书续期不用重新申请。
|
||||
# __JXD_DOWNLOADS_DIR__ -> 本机 tongxunruanjian 仓库的绝对路径 + /deploy/public/downloads
|
||||
# (例如 /opt/tongxunruanjian/deploy/public/downloads)。
|
||||
# 安卓测试安装包目录,对应原 jxd-edge 的 /downloads/ 路由,
|
||||
# 已交付的验收链接 /downloads/jinxunda-android-test-1.0.9.apk 依赖它。
|
||||
# scripts/switch-to-host-nginx.sh 会自动完成这两个替换,见该脚本与
|
||||
# ../README.md「切换到系统 Nginx」一节;手工部署时也可以自己 sed 替换。
|
||||
#
|
||||
# 依赖的后端端口(均只监听 127.0.0.1,由 docker-compose.public.yaml 保证):
|
||||
# OpenIM 消息网关 127.0.0.1:10001
|
||||
# OpenIM API 127.0.0.1:10002
|
||||
# 账号服务 127.0.0.1:10010
|
||||
# MinIO(对象存储) 127.0.0.1:10005
|
||||
# LiveKit 信令 127.0.0.1:17880
|
||||
# 如果 .env 里改过 *_PORT,要同步改这里的端口号。
|
||||
#
|
||||
# 说明:/msg_gateway 与 /livekit/ 是专用的 WebSocket 升级端点,这里直接把
|
||||
# Connection 头写死成 "upgrade",不依赖全局 map $http_upgrade $connection_upgrade
|
||||
# 指令 —— 这样这个站点文件可以独立存在,不需要改系统 Nginx 主配置的 http{} 块。
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name jxd.jinniu.ink;
|
||||
|
||||
# ACME HTTP-01 挑战,续期证书用。
|
||||
location /.well-known/acme-challenge/ {
|
||||
root __JXD_ACME_WEBROOT__;
|
||||
}
|
||||
|
||||
location / {
|
||||
return 301 https://$host$request_uri;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
# http2 指令写法需要 nginx >= 1.25.1(目标服务器宝塔 nginx 为 1.28.0)。
|
||||
# 不要写回 `listen 443 ssl http2`,1.25.1+ 上会报弃用告警。
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
http2 on;
|
||||
server_name jxd.jinniu.ink;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/jxd.jinniu.ink/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/jxd.jinniu.ink/privkey.pem;
|
||||
ssl_session_timeout 1d;
|
||||
ssl_session_cache shared:SSL:10m;
|
||||
ssl_protocols TLSv1.2 TLSv1.3;
|
||||
ssl_prefer_server_ciphers off;
|
||||
|
||||
client_max_body_size 100m;
|
||||
|
||||
# 宝塔主配置的 http{} 里有全局 proxy_cache(见 /www/server/nginx/conf/proxy.conf 的
|
||||
# proxy_cache cache_one),API/WebSocket 代理绝不能吃缓存——显式关掉,
|
||||
# 保持与原 jxd-edge(无任何缓存)行为一致。
|
||||
proxy_cache off;
|
||||
|
||||
# OpenIM 消息长连接(WebSocket)
|
||||
location /msg_gateway {
|
||||
proxy_pass http://127.0.0.1:10001/;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_read_timeout 3600s;
|
||||
proxy_send_timeout 3600s;
|
||||
}
|
||||
|
||||
# 公司账号服务(登录、管理页、rtc_token)
|
||||
location /account/ {
|
||||
proxy_pass http://127.0.0.1:10010/;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
# MinIO 对象(MINIO_EXTERNAL_ADDRESS=https://jxd.jinniu.ink/files)
|
||||
location /files/ {
|
||||
proxy_pass http://127.0.0.1:10005/;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_request_buffering off;
|
||||
}
|
||||
|
||||
# LiveKit 信令(客户端 wss://jxd.jinniu.ink/livekit/ ...)
|
||||
location /livekit/ {
|
||||
proxy_pass http://127.0.0.1:17880/;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_read_timeout 3600s;
|
||||
proxy_send_timeout 3600s;
|
||||
}
|
||||
|
||||
# 安卓测试安装包下载(1:1 迁移自线上 jxd-edge 的 /downloads/ 路由,HEL-552 复核补齐)。
|
||||
# 已交付验收地址:https://jxd.jinniu.ink/downloads/jinxunda-android-test-1.0.9.apk
|
||||
location /downloads/ {
|
||||
alias __JXD_DOWNLOADS_DIR__/;
|
||||
types {
|
||||
application/vnd.android.package-archive apk;
|
||||
}
|
||||
default_type application/octet-stream;
|
||||
add_header Content-Disposition "attachment";
|
||||
limit_except GET HEAD {
|
||||
deny all;
|
||||
}
|
||||
}
|
||||
|
||||
# OpenIM REST API(catch-all,须放最后)
|
||||
location / {
|
||||
proxy_pass http://127.0.0.1:10002;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
}
|
||||
@@ -108,6 +108,19 @@ http {
|
||||
proxy_send_timeout 3600s;
|
||||
}
|
||||
|
||||
# 安卓测试安装包(只读下载目录)
|
||||
location /downloads/ {
|
||||
alias /var/www/downloads/;
|
||||
types {
|
||||
application/vnd.android.package-archive apk;
|
||||
}
|
||||
default_type application/octet-stream;
|
||||
add_header Content-Disposition "attachment";
|
||||
limit_except GET HEAD {
|
||||
deny all;
|
||||
}
|
||||
}
|
||||
|
||||
# OpenIM REST API(catch-all,须放最后)
|
||||
location / {
|
||||
proxy_pass http://openim_api;
|
||||
|
||||
@@ -43,3 +43,4 @@ docker compose \
|
||||
|
||||
echo "已提交 compose 启动。检查: docker compose -f docker-compose.yaml -f deploy/public/docker-compose.public.yaml ps"
|
||||
echo "证书未就绪时先用 nginx.bootstrap.conf 申请证书,见 deploy/public/README.md"
|
||||
echo "HEL-551 起 80/443 由系统 Nginx 持有,还需执行: ./scripts/switch-to-host-nginx.sh"
|
||||
|
||||
@@ -1,11 +1,19 @@
|
||||
#!/usr/bin/env bash
|
||||
# 公网 overlay 回滚到内网 compose:停掉 edge,按原 docker-compose.yaml 拉起。
|
||||
# 公网 overlay 回滚到内网 compose:按原 docker-compose.yaml 拉起。
|
||||
# 不删除 components/ 与 data/,不改现网数据文件。
|
||||
#
|
||||
# HEL-551 后 80/443 由系统 Nginx 持有,日常 docker-compose.public.yaml 里已经
|
||||
# 没有 edge 服务;这里额外叠上 docker-compose.edge-fallback.yaml,是为了兼容
|
||||
# “当前处于 rollback-to-jxd-edge.sh 应急状态、jxd-edge 容器还在跑”这种情况,
|
||||
# 确保它也能被一起清理。系统 Nginx 上的 jxd 站点文件不受本脚本影响,需要的话
|
||||
# 用 scripts/rollback-to-jxd-edge.sh 或手工禁用。
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")/.."
|
||||
|
||||
docker compose -f docker-compose.yaml -f deploy/public/docker-compose.public.yaml stop edge || true
|
||||
docker compose -f docker-compose.yaml -f deploy/public/docker-compose.public.yaml rm -f edge || true
|
||||
docker compose -f docker-compose.yaml -f deploy/public/docker-compose.public.yaml \
|
||||
-f deploy/public/docker-compose.edge-fallback.yaml stop edge 2>/dev/null || true
|
||||
docker compose -f docker-compose.yaml -f deploy/public/docker-compose.public.yaml \
|
||||
-f deploy/public/docker-compose.edge-fallback.yaml rm -f edge 2>/dev/null || true
|
||||
|
||||
docker compose -f docker-compose.yaml up -d
|
||||
|
||||
|
||||
Executable
+31
@@ -0,0 +1,31 @@
|
||||
#!/usr/bin/env bash
|
||||
# HEL-551:紧急回滚——系统 Nginx 让出 jxd.jinniu.ink 站点,jxd-edge 用 host
|
||||
# 网络重新独占 80/443。由总工在服务器上执行;施工员本卡不跑本脚本。
|
||||
#
|
||||
# 用法: ./scripts/rollback-to-jxd-edge.sh
|
||||
# 只禁用 jxd 这一个站点文件(改后缀 .disabled,不删除,不影响系统 Nginx
|
||||
# 上的其他站点,例如 solsum.cn),然后重载系统 Nginx。
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")/.."
|
||||
|
||||
HOST_NGINX_VHOST_DIR="${HOST_NGINX_VHOST_DIR:-/www/server/panel/vhost/nginx}"
|
||||
HOST_NGINX_INIT="${HOST_NGINX_INIT:-/etc/init.d/nginx}"
|
||||
SITE_CONF_NAME="jxd.jinniu.ink.conf"
|
||||
|
||||
echo "== 1/2 禁用系统 Nginx 上的 jxd.jinniu.ink 站点 =="
|
||||
if [ -f "${HOST_NGINX_VHOST_DIR}/${SITE_CONF_NAME}" ]; then
|
||||
mv "${HOST_NGINX_VHOST_DIR}/${SITE_CONF_NAME}" "${HOST_NGINX_VHOST_DIR}/${SITE_CONF_NAME}.disabled"
|
||||
"$HOST_NGINX_INIT" reload 2>/dev/null || systemctl reload nginx 2>/dev/null || true
|
||||
else
|
||||
echo "未找到 ${HOST_NGINX_VHOST_DIR}/${SITE_CONF_NAME},跳过禁用步骤"
|
||||
fi
|
||||
|
||||
echo "== 2/2 重新拉起 jxd-edge(host 网络,独占 80/443) =="
|
||||
docker compose \
|
||||
-f docker-compose.yaml \
|
||||
-f deploy/public/docker-compose.public.yaml \
|
||||
-f deploy/public/docker-compose.edge-fallback.yaml \
|
||||
up -d edge
|
||||
|
||||
echo "回滚完成,jxd-edge 已重新接管 80/443。检查: docker compose ps"
|
||||
echo "数据目录 components/ 与 data/ 未动。"
|
||||
Executable
+104
@@ -0,0 +1,104 @@
|
||||
#!/usr/bin/env bash
|
||||
# HEL-551:把公网 80/443 从 jxd-edge(host 网络容器)切换到系统/宝塔 Nginx。
|
||||
# 由总工在服务器上执行;施工员本卡不跑本脚本,也不 SSH 改现网。
|
||||
#
|
||||
# 用法: ./scripts/switch-to-host-nginx.sh
|
||||
# 失败时自动回滚到 jxd-edge;也可以随时手动跑 ./scripts/rollback-to-jxd-edge.sh。
|
||||
#
|
||||
# 执行前可以按实际环境覆盖这几个变量,默认按宝塔面板的常见路径:
|
||||
# HOST_NGINX_VHOST_DIR 站点配置目录(宝塔: /www/server/panel/vhost/nginx)
|
||||
# HOST_NGINX_BIN nginx 可执行文件,用来做 -t 语法检查
|
||||
# HOST_NGINX_INIT initscript,用来启动/重载(宝塔一般装了 /etc/init.d/nginx)
|
||||
# HOST_NGINX_PIDFILE 系统 Nginx 的 pid 文件(宝塔: /www/server/nginx/logs/nginx.pid)
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")/.."
|
||||
REPO_DIR="$(pwd)"
|
||||
|
||||
SITE_CONF_SRC="deploy/public/host-nginx/jxd.jinniu.ink.conf"
|
||||
SITE_CONF_NAME="jxd.jinniu.ink.conf"
|
||||
ACME_WEBROOT="${REPO_DIR}/deploy/public/acme"
|
||||
DOWNLOADS_DIR="${REPO_DIR}/deploy/public/downloads"
|
||||
|
||||
HOST_NGINX_VHOST_DIR="${HOST_NGINX_VHOST_DIR:-/www/server/panel/vhost/nginx}"
|
||||
HOST_NGINX_BIN="${HOST_NGINX_BIN:-/www/server/nginx/sbin/nginx}"
|
||||
HOST_NGINX_INIT="${HOST_NGINX_INIT:-/etc/init.d/nginx}"
|
||||
HOST_NGINX_PIDFILE="${HOST_NGINX_PIDFILE:-/www/server/nginx/logs/nginx.pid}"
|
||||
|
||||
# 判断"系统 Nginx 本尊"是否在跑,只认 pidfile 里的进程。
|
||||
# 不能用裸 pgrep -x nginx:宿主机上还有别的 nginx 容器(如 solsum 首页容器的
|
||||
# nginx -g daemon off),它们会让 pgrep 误报"系统 Nginx 已在跑",导致对已停止的
|
||||
# 系统 Nginx 执行 reload(必然失败),80/443 陷入无人监听。
|
||||
nginx_running() {
|
||||
[ -f "$HOST_NGINX_PIDFILE" ] && kill -0 "$(cat "$HOST_NGINX_PIDFILE" 2>/dev/null)" 2>/dev/null
|
||||
}
|
||||
|
||||
BACKUP_DIR="/root/jxd-nginx-switch-backup-$(date +%Y%m%d%H%M%S)"
|
||||
|
||||
rollback() {
|
||||
echo "!! 切换失败,回滚到 jxd-edge" >&2
|
||||
./scripts/rollback-to-jxd-edge.sh || true
|
||||
exit 1
|
||||
}
|
||||
|
||||
echo "== 1/5 备份系统 Nginx 站点目录、金讯达 compose、证书续期引用 =="
|
||||
mkdir -p "$BACKUP_DIR"
|
||||
if [ -d "$HOST_NGINX_VHOST_DIR" ]; then
|
||||
cp -a "$HOST_NGINX_VHOST_DIR" "$BACKUP_DIR/vhost-nginx"
|
||||
fi
|
||||
cp -a docker-compose.yaml deploy/public/docker-compose.public.yaml "$BACKUP_DIR/"
|
||||
if [ -f "/etc/letsencrypt/renewal/jxd.jinniu.ink.conf" ]; then
|
||||
mkdir -p "$BACKUP_DIR/letsencrypt-renewal"
|
||||
cp -a /etc/letsencrypt/renewal/jxd.jinniu.ink.conf "$BACKUP_DIR/letsencrypt-renewal/"
|
||||
fi
|
||||
echo "备份完成: $BACKUP_DIR"
|
||||
|
||||
echo "== 2/5 生成站点配置(替换 ACME webroot / downloads 占位符)=="
|
||||
mkdir -p "$ACME_WEBROOT"
|
||||
TMP_CONF="$(mktemp)"
|
||||
sed -e "s#__JXD_ACME_WEBROOT__#${ACME_WEBROOT}#g" \
|
||||
-e "s#__JXD_DOWNLOADS_DIR__#${DOWNLOADS_DIR}#g" \
|
||||
"$SITE_CONF_SRC" > "$TMP_CONF"
|
||||
|
||||
if [ ! -d "$HOST_NGINX_VHOST_DIR" ]; then
|
||||
echo "站点目录 $HOST_NGINX_VHOST_DIR 不存在,请先用 HOST_NGINX_VHOST_DIR= 指定正确路径" >&2
|
||||
rm -f "$TMP_CONF"
|
||||
exit 1
|
||||
fi
|
||||
cp "$TMP_CONF" "${HOST_NGINX_VHOST_DIR}/${SITE_CONF_NAME}"
|
||||
rm -f "$TMP_CONF"
|
||||
|
||||
echo "== 3/5 校验系统 Nginx 配置语法(先检查,不合格立即退出,不动服务)=="
|
||||
if ! "$HOST_NGINX_BIN" -t; then
|
||||
echo "系统 Nginx 配置检查失败,移除新站点文件,不触碰任何服务" >&2
|
||||
rm -f "${HOST_NGINX_VHOST_DIR}/${SITE_CONF_NAME}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "== 4/5 停 jxd-edge,启动/重载系统 Nginx =="
|
||||
docker compose -f docker-compose.yaml -f deploy/public/docker-compose.public.yaml \
|
||||
-f deploy/public/docker-compose.edge-fallback.yaml stop edge 2>/dev/null || true
|
||||
docker compose -f docker-compose.yaml -f deploy/public/docker-compose.public.yaml \
|
||||
-f deploy/public/docker-compose.edge-fallback.yaml rm -f edge 2>/dev/null || true
|
||||
|
||||
if nginx_running; then
|
||||
"$HOST_NGINX_INIT" reload || systemctl reload nginx || rollback
|
||||
else
|
||||
"$HOST_NGINX_INIT" start || systemctl start nginx || rollback
|
||||
fi
|
||||
|
||||
sleep 1
|
||||
if ! nginx_running; then
|
||||
rollback
|
||||
fi
|
||||
|
||||
echo "== 5/5 健康检查 =="
|
||||
sleep 1
|
||||
CODE="$(curl -sk -o /dev/null -w '%{http_code}' --max-time 5 https://jxd.jinniu.ink/ || echo 000)"
|
||||
if [ "$CODE" = "000" ]; then
|
||||
echo "https://jxd.jinniu.ink/ 无响应(code=$CODE)" >&2
|
||||
rollback
|
||||
fi
|
||||
|
||||
echo "切换完成。系统 Nginx 已独占 80/443,jxd-edge 已下线。"
|
||||
echo "备份目录: $BACKUP_DIR"
|
||||
echo "如需回滚: ./scripts/rollback-to-jxd-edge.sh"
|
||||
Reference in New Issue
Block a user