fix(i18n,404,nginx): broken-windows batch B2 from the external review
Deploy / build (push) Successful in 3m59s
Deploy / build (push) Successful in 3m59s
All items measured before/after with curl, on the origin and through Cloudflare: - /posts/zh/ answered 403 (directory with no index) -> nginx 301 to the new archive - /zh/posts/ 404'd -> new src/pages/zh/posts/index.astro (build 163 -> 165 pages) - ZH nav pointed "关于" at /zh/ and "文章" at /zh/ -> /zh/about/ and /zh/posts/ - og:locale was "en" on every Chinese page -> zh_CN, plus og:locale:alternate on both languages (EN pages now advertise zh_CN as well) - hreflang "zh" -> "zh-Hans"; <html lang> on ZH pages -> zh-Hans - no 404 page existed -> src/pages/404.astro, served by nginx with a 404 status so crawlers skip it, offering search + archive + the 3 newest posts - JSON-LD Person gained worksFor (Hoelee Enterprise); image still omitted until the author photo exists rather than pointing at a placeholder nginx: config moved from the stock image file to a host bind mount (/mnt/user/docker/nginx-hoelee-blog/conf.d/default.conf, Portainer stack 247 on endpoint 3), validated with nginx -t in a throwaway container before the redeploy. It also sets /_astro/* to immutable 1-year (hashed names) and HTML to must-revalidate; unhashed /og/*.png and /banners/*.png keep the default TTL on purpose. Note: the public HSTS and 16-day asset TTL come from Cloudflare zone settings, not from this nginx. Docs: ops-runbook.md (the nginx layer + why each rule), project-state.md (B2 entry and the two open Cloudflare items my token cannot write).
This commit is contained in:
1 parent
831d440661
commit
874c434576
6 files changed
+160
-6
No files matched your search
@@ -45,7 +45,7 @@ const ogImageUrl = new URL(ogImage, SITE.url).href;
|
||||
const hreflang = altLocaleUrl
|
||||
? [
|
||||
{ hreflang: 'en', href: lang === 'en' ? canonical : altLocaleUrl },
|
||||
{ hreflang: 'zh', href: lang === 'zh' ? canonical : altLocaleUrl },
|
||||
{ hreflang: 'zh-Hans', href: lang === 'zh' ? canonical : altLocaleUrl },
|
||||
{ hreflang: 'x-default', href: lang === 'en' ? canonical : altLocaleUrl },
|
||||
]
|
||||
: [];
|
||||
@@ -63,7 +63,7 @@ const nav = isZh
|
||||
---
|
||||
|
||||
<!doctype html>
|
||||
<html lang={lang} data-theme="dark">
|
||||
<html lang={isZh ? 'zh-Hans' : lang} data-theme="dark">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
@@ -87,8 +87,8 @@ const nav = isZh
|
||||
<meta property="og:image" content={ogImageUrl} />
|
||||
<meta property="og:image:width" content="1200" />
|
||||
<meta property="og:image:height" content="630" />
|
||||
<meta property="og:locale" content={SITE.locale} />
|
||||
{lang === 'zh' && <meta property="og:locale:alternate" content="en_US" />}
|
||||
<meta property="og:locale" content={isZh ? 'zh_CN' : SITE.locale} />
|
||||
<meta property="og:locale:alternate" content={isZh ? 'en_US' : 'zh_CN'} />
|
||||
|
||||
<!-- Twitter -->
|
||||
<meta name="twitter:card" content="summary_large_image" />
|
||||
@@ -128,6 +128,15 @@ const nav = isZh
|
||||
email: SITE.email,
|
||||
sameAs: [SITE.linkedin, SITE.github, SITE.gitea, SITE.website].filter(Boolean),
|
||||
jobTitle: 'Full-stack Developer & DevOps Engineer',
|
||||
// The consultancy that does the client work — ties the blog's author node to
|
||||
// the business entity (and gives the hiring side a company reference).
|
||||
worksFor: {
|
||||
'@type': 'Organization',
|
||||
name: 'Hoelee Enterprise',
|
||||
url: SITE.website,
|
||||
},
|
||||
// TODO(image): `image` stays absent until the author photo exists — see
|
||||
// project-state §2 B4. A placeholder URL would be worse than no image.
|
||||
knowsAbout: [
|
||||
'Full-stack engineering', 'DevOps', 'Self-hosting',
|
||||
'Docker', 'WordPress', 'AI automation', 'Web3',
|
||||
@@ -163,9 +172,9 @@ const nav = isZh
|
||||
<header class="site-header">
|
||||
<nav class="nav" aria-label="Main">
|
||||
<a class="brand" href="/">Mr<span class="dot"> Hoelee</span></a>
|
||||
<a href={isZh ? '/zh/' : '/posts/'}>{nav.posts}</a>
|
||||
<a href={isZh ? '/zh/posts/' : '/posts/'}>{nav.posts}</a>
|
||||
<a href={isZh ? '/zh/categories/' : '/categories/'}>{nav.categories}</a>
|
||||
<a href={isZh ? '/zh/' : '/about/'}>{nav.about}</a>
|
||||
<a href={isZh ? '/zh/about/' : '/about/'}>{nav.about}</a>
|
||||
<a href="/rss.xml" title={nav.rss}>{nav.rss}</a>
|
||||
<button class="search-toggle" id="search-toggle" aria-label={isZh ? '搜索' : 'Search'}>⌕</button>
|
||||
<a class="lang-switch" href={resolvedSwitchHref} aria-label={isZh ? 'Switch to English' : '切换到中文'}>{switchLabel}</a>
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
---
|
||||
import BaseLayout from '../layouts/BaseLayout.astro';
|
||||
import { getCollection } from 'astro:content';
|
||||
import { isEn } from '../lib/lang';
|
||||
import { sortForListing } from '../lib/sort';
|
||||
|
||||
// Static 404. nginx serves it with `error_page 404 /404.html`, so the status code
|
||||
// stays 404 (crawlers do not index it) while the visitor gets a way forward.
|
||||
// Before this existed, a broken link showed nginx's bare default page.
|
||||
const latest = sortForListing(await getCollection('posts', isEn)).slice(0, 3);
|
||||
const fmt = (d: Date) =>
|
||||
d.toLocaleDateString('en-US', { year: 'numeric', month: 'long', day: 'numeric' });
|
||||
---
|
||||
|
||||
<BaseLayout
|
||||
title="404 — Page Not Found — Mr Hoelee"
|
||||
description="That URL does not exist on this site. Search the posts or browse the archive."
|
||||
>
|
||||
<h1>404 — container exited (code 1)</h1>
|
||||
<p>
|
||||
There is no page at this address. It may have been renamed, or the link that sent
|
||||
you here may be wrong. Nothing is broken on your side.
|
||||
</p>
|
||||
|
||||
<p class="notfound-actions">
|
||||
<button id="search-cta" class="notfound-btn" type="button">⌕ Search the posts</button>
|
||||
<a href="/posts/">Browse all posts</a>
|
||||
<span class="sep">·</span>
|
||||
<a href="/categories/">Categories</a>
|
||||
<span class="sep">·</span>
|
||||
<a href="/zh/">中文</a>
|
||||
</p>
|
||||
|
||||
<h2>Recent posts</h2>
|
||||
<ul class="post-list">
|
||||
{latest.map((p) => (
|
||||
<li class="post-row notfound-row">
|
||||
<div class="body">
|
||||
<a href={`/posts/${p.slug}/`}><h2>{p.data.title}</h2></a>
|
||||
<div class="meta">
|
||||
<time datetime={p.data.pubDate.toISOString()}>{fmt(p.data.pubDate)}</time>
|
||||
<span class="sep">·</span>
|
||||
<a class="tag" href={`/categories/${p.data.category}/`}>{p.data.category}</a>
|
||||
</div>
|
||||
<p>{p.data.description}</p>
|
||||
</div>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
|
||||
<script>
|
||||
// The search overlay is mounted on every page by BaseLayout; its trigger is the
|
||||
// ⌕ button in the header (also bound to Ctrl/Cmd+K there). Route this page's
|
||||
// button to the same overlay instead of growing a second search implementation.
|
||||
const cta = document.getElementById('search-cta');
|
||||
cta?.addEventListener('click', () => {
|
||||
const toggle = document.getElementById('search-toggle');
|
||||
if (toggle) toggle.click();
|
||||
});
|
||||
</script>
|
||||
</BaseLayout>
|
||||
@@ -0,0 +1,28 @@
|
||||
---
|
||||
import BaseLayout from '../../../layouts/BaseLayout.astro';
|
||||
import PostList from '../../../components/PostList.astro';
|
||||
import { getCollection } from 'astro:content';
|
||||
import { isZh } from '../../../lib/lang';
|
||||
import { sortForListing } from '../../../lib/sort';
|
||||
import { SITE } from '../../../config';
|
||||
|
||||
// The ZH archive. Until 2026-10-16 the ZH nav pointed "文章/关于" at /zh/ and this
|
||||
// route did not exist at all: /posts/zh/ (a directory with no index) answered 403
|
||||
// from nginx, and /zh/posts/ 404'd. Both are fixed here + in the nginx conf.
|
||||
const posts = sortForListing(await getCollection('posts', isZh));
|
||||
---
|
||||
|
||||
<BaseLayout
|
||||
title="文章 — Mr Hoelee"
|
||||
description="Hoelee 技术博客的全部中文文章。"
|
||||
lang="zh"
|
||||
switchHref="/posts/"
|
||||
altLocaleUrl={`${SITE.url}/posts/`}
|
||||
>
|
||||
<h1>文章</h1>
|
||||
{posts.length === 0 ? (
|
||||
<p><em>中文文章即将发布,敬请期待。</em></p>
|
||||
) : (
|
||||
<PostList posts={posts} lang="zh" />
|
||||
)}
|
||||
</BaseLayout>
|
||||
@@ -329,6 +329,26 @@ pre code {
|
||||
}
|
||||
.related-card time { font-size: 0.78rem; margin-top: auto; padding-top: 0.4rem; }
|
||||
|
||||
/* ---------- 404 ---------- */
|
||||
.notfound-actions {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
margin: 1.5rem 0 2rem;
|
||||
}
|
||||
.notfound-btn {
|
||||
font: inherit;
|
||||
color: var(--ink);
|
||||
background: var(--surface);
|
||||
border: 1px solid var(--border);
|
||||
border-radius: var(--radius);
|
||||
padding: 0.45rem 0.9rem;
|
||||
cursor: pointer;
|
||||
}
|
||||
.notfound-btn:hover { border-color: var(--brand); color: var(--brand); }
|
||||
.notfound-row .body { padding-block: 0.6rem; }
|
||||
|
||||
/* ---------- Post list ---------- */
|
||||
.post-list { list-style: none; padding: 0; margin: 0; }
|
||||
.post-list li {
|
||||
|
||||
Reference in new issue
Block a user