revert: 撤掉单仓内的门户骨架,门户以独立仓 iotlcm-public/website 为唯一来源
mirror-to-gitee / mirror (push) Successful in 58s
mirror-to-gitee / mirror (push) Successful in 58s
原因 门户已拆分为独立仓 iotlcm-public/website(11:28 建仓,13:13 完成 fafc743「并入旧骨架独有价值内容,修 favicon 落地路径与过渡形态绑定」), 是门户的唯一事实来源。本仓6c8314a合并进来的 website/ 是拆分前的 旧骨架,继续保留会导致: - 两份门户代码持续漂移,同一问题要在两个仓各修一遍 - 单仓 compose / gateway / Makefile 里残留 with-website profile 与 /www/ 路由,与独立仓「门户自起容器、独立端口」的既定方案冲突 本提交 = revert -m 1 6c8314a,效果等同回到e98f856(git diffe98f856HEAD 为空)。回退点: tag backup/before-revert-portal-20261104 ->6c8314a门户部署改为(164 上,独立目录,不动 iotlcm-deploy): git clone https://git.5iot.com/iotlcm-public/website.git ~/iotlcm/website cd ~/iotlcm/website PORTAL_BIND_ADDR=0.0.0.0 docker compose -f deploy/docker-compose.yml up -d --build
This commit is contained in:
@@ -46,11 +46,6 @@ upstream iotlcm_app_server {
|
||||
server app-server:8010 resolve;
|
||||
}
|
||||
|
||||
upstream iotlcm_website {
|
||||
zone iotlcm_website 64k;
|
||||
server website:80 resolve;
|
||||
}
|
||||
|
||||
# ---------- OpenAPI 对外域名 ----------
|
||||
server {
|
||||
listen 80;
|
||||
@@ -122,26 +117,6 @@ server {
|
||||
}
|
||||
}
|
||||
|
||||
# ---------- 官网 ----------
|
||||
# 独立域名形态:把 server_name 换成实际官网域名,
|
||||
# 并让 DNS 指到这台机器。官网容器以 SITE_BASE=/ 构建(资源引用为 /assets/...),
|
||||
# 所以这里按根路径转发。
|
||||
server {
|
||||
listen 80;
|
||||
server_name www.your-domain.example.com;
|
||||
|
||||
client_max_body_size 200m;
|
||||
|
||||
location / {
|
||||
proxy_pass http://iotlcm_website;
|
||||
proxy_http_version 1.1;
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
# ---------- 小程序 / H5 ----------
|
||||
server {
|
||||
listen 80;
|
||||
|
||||
Reference in New Issue
Block a user