Allow Cloudflare Web Analytics in the CSP

Cloudflare auto-injects beacon.min.js, which the CSP was blocking.

src/app/layout.tsx

@@ -58,6 +58,9 @@ const websiteLd = {
   author: { "@type": "Person", name: site.name },
 };
 
+const isProd = process.env.NODE_ENV === "production";
+const gaId = "G-9XLTKZF07C";
+
 const umamiScript = process.env.PUBLIC_UMAMI_SCRIPT_URL;
 const umamiId = process.env.PUBLIC_UMAMI_WEBSITE_ID;
 
@@ -81,7 +84,21 @@ export default function RootLayout({ children }: LayoutProps<"/">) {
       <body>
         <JsonLd data={websiteLd} />
         <Layout>{children}</Layout>
-        {umamiScript && umamiId && (
+        {isProd && (
+          <>
+            <Script
+              src={`https://www.googletagmanager.com/gtag/js?id=${gaId}`}
+              strategy="afterInteractive"
+            />
+            <Script id="google-analytics" strategy="afterInteractive">
+              {`window.dataLayer = window.dataLayer || [];
+function gtag(){dataLayer.push(arguments);}
+gtag('js', new Date());
+gtag('config', '${gaId}');`}
+            </Script>
+          </>
+        )}
+        {isProd && umamiScript && umamiId && (
           <Script defer src={umamiScript} data-website-id={umamiId} />
         )}
       </body>

sws.toml

@@ -7,10 +7,67 @@ ignore-hidden-files = false
 
 [advanced]
 
+# Legacy Hugo URLs (/posts, /writings, /tags, ...) -> current routes. First match wins,
+# so the trailing-slash variants Google crawled come before the bare ones.
+[[advanced.redirects]]
+source = "/posts/page/{*}/"
+destination = "/writing"
+kind = 301
+
+[[advanced.redirects]]
+source = "/posts/page/{*}"
+destination = "/writing"
+kind = 301
+
+[[advanced.redirects]]
+source = "/{posts,writings,tags,archive}/"
+destination = "/writing"
+kind = 301
+
+[[advanced.redirects]]
+source = "/{posts,writings}/{*}/"
+destination = "/writing/$2"
+kind = 301
+
+[[advanced.redirects]]
+source = "/{posts,writings}/{*}"
+destination = "/writing/$2"
+kind = 301
+
+[[advanced.redirects]]
+source = "/{posts,writings,tags,archive}"
+destination = "/writing"
+kind = 301
+
+[[advanced.redirects]]
+source = "/tags/{*}/"
+destination = "/writing"
+kind = 301
+
+[[advanced.redirects]]
+source = "/tags/{*}"
+destination = "/writing"
+kind = 301
+
+[[advanced.redirects]]
+source = "/about/"
+destination = "/"
+kind = 301
+
+[[advanced.redirects]]
+source = "/about"
+destination = "/"
+kind = 301
+
+[[advanced.redirects]]
+source = "/index.xml"
+destination = "/rss.xml"
+kind = 301
+
 [[advanced.headers]]
 source = "**"
 [advanced.headers.headers]
-Content-Security-Policy = "default-src 'self'; script-src 'self' 'unsafe-inline' https://utteranc.es https://analytics.andwati.com; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self'; connect-src 'self' https://analytics.andwati.com; frame-src https://www.youtube-nocookie.com https://utteranc.es; object-src 'none'; base-uri 'self'; form-action 'self'; frame-ancestors 'none'; upgrade-insecure-requests"
+Content-Security-Policy = "default-src 'self'; script-src 'self' 'unsafe-inline' https://utteranc.es https://analytics.andwati.com https://www.googletagmanager.com https://static.cloudflareinsights.com; style-src 'self' 'unsafe-inline'; img-src 'self' data: https://www.google-analytics.com https://www.googletagmanager.com; font-src 'self'; connect-src 'self' https://cloudflareinsights.com https://analytics.andwati.com https://www.google-analytics.com https://*.google-analytics.com https://*.analytics.google.com https://www.googletagmanager.com; frame-src https://www.youtube-nocookie.com https://utteranc.es; object-src 'none'; base-uri 'self'; form-action 'self'; frame-ancestors 'none'; upgrade-insecure-requests"
 X-Frame-Options = "DENY"
 X-Content-Type-Options = "nosniff"
 Referrer-Policy = "strict-origin-when-cross-origin"