From f04c14116db90ece8b84d43fee2fc6606bc33ae8 Mon Sep 17 00:00:00 2001
From: dallaslu <dallaslu@noreply.forge.st>
Date: Fri, 5 Jun 2026 13:06:08 +0800
Subject: [PATCH] update

---
 redirect/root-to-www.conf   |  9 +++++++++
 redirect/www-to-root.conf   |  3 +++
 scripts/validate-docker.ps1 | 10 +++++++---
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/redirect/root-to-www.conf b/redirect/root-to-www.conf
index e69de29..131ad8f 100644
--- a/redirect/root-to-www.conf
+++ b/redirect/root-to-www.conf
@@ -0,0 +1,9 @@
+set $root_domain "";
+
+if ($server_name ~* ^www\.(?<apex_domain>.+)$) {
+	set $root_domain $apex_domain;
+}
+
+if ($host = $root_domain) {
+	return 307 $scheme://$server_name$request_uri;
+}
diff --git a/redirect/www-to-root.conf b/redirect/www-to-root.conf
index e69de29..934c1b3 100644
--- a/redirect/www-to-root.conf
+++ b/redirect/www-to-root.conf
@@ -0,0 +1,3 @@
+if ($host = www.$server_name) {
+	return 307 $scheme://$server_name$request_uri;
+}
diff --git a/scripts/validate-docker.ps1 b/scripts/validate-docker.ps1
index bfff763..49772bc 100644
--- a/scripts/validate-docker.ps1
+++ b/scripts/validate-docker.ps1
@@ -19,21 +19,25 @@ $serverSnippetConfig = @(
 	"}"
 ) -join "\n"
 
-$serverSnippetConfigShell = $serverSnippetConfig -replace "\\", "\\\\" -replace "'", "'\"'\"'" -replace "`n", "\\n"
+$serverSnippetConfigShell = $serverSnippetConfig -replace "`n", "\\n"
 
 $containerCommand = @(
 	"set -eu"
 	"apk add --no-cache openssl >/dev/null"
-	"mkdir -p /etc/nginx/snippets/cert /etc/ssl/certimate /tmp/nginx-kit/snippets/cert"
+	"mkdir -p /etc/nginx/snippets/cert /etc/ssl/certimate /tmp/nginx-kit/snippets/cert /tmp/nginx-kit/examples/snippets/cert"
 	"openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/ssl/certimate/example.com.key -out /etc/ssl/certimate/example.com.crt -subj '/CN=example.com' -days 1 >/dev/null 2>&1"
 	"cp /etc/nginx/kit/templates/cert/example.com.conf /etc/nginx/snippets/cert/mydomain.com.conf"
 	"cp /etc/nginx/kit/templates/cert/example.com.conf /tmp/nginx-kit/snippets/cert/mydomain.com.conf"
+	"cp /etc/nginx/kit/templates/cert/example.com.conf /tmp/nginx-kit/examples/snippets/cert/mydomain.com.conf"
 	"ln -s /etc/nginx/kit /tmp/nginx-kit/kit"
+	"mkdir -p /tmp/nginx-kit/examples"
+	"ln -s /etc/nginx/kit /tmp/nginx-kit/examples/kit"
+	"cp /etc/nginx/kit/examples/reverse-proxy.nginx.conf /tmp/nginx-kit/examples/reverse-proxy.nginx.conf"
 	"printf '%b' '$serverSnippetConfigShell' > /tmp/nginx-kit/server-snippet.nginx.conf"
 	"echo 'Validating examples/example.com.conf'"
 	"nginx -t -c /tmp/nginx-kit/server-snippet.nginx.conf"
 	"echo 'Validating examples/reverse-proxy.nginx.conf'"
-	"nginx -t -c /etc/nginx/kit/examples/reverse-proxy.nginx.conf"
+	"nginx -t -c /tmp/nginx-kit/examples/reverse-proxy.nginx.conf"
 ) -join "; "
 
 docker run --rm `