Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec #408 / [ADR-0019](../docs/adr/0019-oss-caddy-dual-env-deployment.md)。同

- **入站走 Cloudflare Tunnel**([ADR-0020](../docs/adr/0020-cloudflare-tunnel-ingress.md)):cloudflared 以宿主 systemd 服务主动外连 CF 边缘,TLS 在边缘终结,流量转发到本机 `http://localhost:80`(Host 头保留)。成因:京东云按 Host 做备案门禁,未备案域名的入站流量被丢弃(2026-10-13 实测);隧道使入站端口归零、证书运维归零。
- Caddyfile 打进 `cyber-stray-caddy` 镜像(配置随版本走);**:80 与 :443 都直接伺服内容、不做跳转**,隧道与直连两种来路都能命中。
- 过渡期(备案中):`cs.caca.qzz.io` → prod web、`auth.cs.caca.qzz.io` → casdoor、`dev.cs.caca.qzz.io` → staging(Basic Auth)、`http://<公网IP>` → prod web(IP 直访)。域名侧 = Cloudflare 面板里的 Tunnel Public Hostnames(各指 `http://localhost:80`)。
- 过渡期(备案中):`cs.caca.qzz.io` → prod web、`csauth.caca.qzz.io` → casdoor、`csdev.caca.qzz.io` → staging(Basic Auth)、`http://<公网IP>` → prod web(IP 直访)。域名侧 = Cloudflare 面板里的 Tunnel Public Hostnames(各指 `http://localhost:80`)。
- 切 kleinbottle.top checklist(**同一窗口原子执行**,issuer 不一致会打断 OIDC 登录):
1. 同隧道加 Public Hostname:`kleinbottle.top`、`auth.kleinbottle.top`(零源站改动);
2. Caddyfile 站点块补根域与 `auth.` 目标,发布一版;
Expand Down
4 changes: 2 additions & 2 deletions deploy/caddy/Caddyfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ cs.caca.qzz.io, http://cs.caca.qzz.io {
import app_entry
}

auth.cs.caca.qzz.io, http://auth.cs.caca.qzz.io {
csauth.caca.qzz.io, http://csauth.caca.qzz.io {
import identity_entry
}

dev.cs.caca.qzz.io, http://dev.cs.caca.qzz.io {
csdev.caca.qzz.io, http://csdev.caca.qzz.io {
import staging_entry
}

Expand Down
2 changes: 1 addition & 1 deletion deploy/casdoor/app.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ dbUser3 =
dbPassword3 =
initScore = 0
logPostOnly = true
origin = https://auth.cs.caca.qzz.io
origin = https://csauth.caca.qzz.io
Loading