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
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ RUN ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \
&& rm -rf /var/lib/apt/lists/*

COPY ./nginx/default.conf /etc/nginx/conf.d/docs.conf
COPY ./nginx/zh-only-redirects.conf /etc/nginx/conf.d/zh-only-redirects.conf
# rewrite 只能在 server 上下文使用,故不放 conf.d/(那里会被 include 进 http 块),
# 而是由 default.conf 的 server 块 include 本文件
COPY ./nginx/zh-only-redirects.conf /etc/nginx/zh-only-redirects.conf
3 changes: 3 additions & 0 deletions nginx/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ server {
listen 4000;
server_name localhost;

# 仅中文页面的旧根路径 URL -> /zh/ 新路径(由 scripts/gen-rewrites.mjs 生成)
include /etc/nginx/zh-only-redirects.conf;

location / {
index index.html index.htm;

Expand Down
2 changes: 2 additions & 0 deletions nginx/zh-only-redirects.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# 本文件由 scripts/gen-rewrites.mjs 生成,勿手改。
# 仅中文版本(暂无英文翻译)的页面:旧根路径 URL -> /zh/ 新路径。
# 注意:rewrite 不能出现在 http 上下文,本文件须由 server 块 include
# (见 nginx/default.conf 与 Dockerfile),不能放进 /etc/nginx/conf.d/。
rewrite ^/docs/release-notes/release-7.2-ee/?$ /docs/zh/release-notes/release-7.2-ee? permanent;
rewrite ^/docs/release-notes/release-7.2-ee\.html$ /docs/zh/release-notes/release-7.2-ee? permanent;
2 changes: 2 additions & 0 deletions scripts/gen-rewrites.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ const zhOnly = baseline.filter((b) => b.liveAt === 'redirect-to-zh')
const conf = [
'# 本文件由 scripts/gen-rewrites.mjs 生成,勿手改。',
'# 仅中文版本(暂无英文翻译)的页面:旧根路径 URL -> /zh/ 新路径。',
'# 注意:rewrite 不能出现在 http 上下文,本文件须由 server 块 include',
'# (见 nginx/default.conf 与 Dockerfile),不能放进 /etc/nginx/conf.d/。',
...zhOnly.map(
({ url }) =>
`rewrite ^/docs/${url}/?$ /docs/zh/${url}? permanent;\nrewrite ^/docs/${url}\\.html$ /docs/zh/${url}? permanent;`
Expand Down
Loading