From a006797fbbba3be673bf2d808b1a22a05cdcec66 Mon Sep 17 00:00:00 2001
From: Walter Oggioni <oggioni.walter@gmail.com>
Date: Fri, 24 Oct 2025 13:19:54 +0800
Subject: [PATCH] updated nginx to 1.29.2

---
 .gitea/workflows/build-nginx.yaml | 8 ++++----
 nginx/Dockerfile                  | 2 +-
 nginx/conf/nginx.conf             | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitea/workflows/build-nginx.yaml b/.gitea/workflows/build-nginx.yaml
index 0c0536f..7546608 100644
--- a/.gitea/workflows/build-nginx.yaml
+++ b/.gitea/workflows/build-nginx.yaml
@@ -37,11 +37,11 @@ jobs:
           ssh: default=/home/luser/.ssh/id_ed25519
           tags: |
             "gitea.woggioni.net/woggioni/nginx:latest"
-            "gitea.woggioni.net/woggioni/nginx:v1.29.1"
+            "gitea.woggioni.net/woggioni/nginx:v1.29.2"
           secrets: |
             GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
           build-args: |
-            NGINX_VERSION=1.29.1
+            NGINX_VERSION=1.29.2
             NGINX_BRANCH=vanilla
           cache-from: type=registry,ref=gitea.woggioni.net/woggioni/nginx:buildx-vanilla
           cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/nginx:buildx-vanilla
@@ -58,11 +58,11 @@ jobs:
           ssh: default=/home/luser/.ssh/id_ed25519
           tags: |
             "gitea.woggioni.net/woggioni/nginx:woggioni"
-            "gitea.woggioni.net/woggioni/nginx:v1.29.1-woggioni"
+            "gitea.woggioni.net/woggioni/nginx:v1.29.2-woggioni"
           secrets: |
             GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
           build-args: |
-            NGINX_VERSION=1.29.1
+            NGINX_VERSION=1.29.2
             NGINX_BRANCH=woggioni
           cache-from: type=registry,ref=gitea.woggioni.net/woggioni/nginx:buildx-woggioni
           cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/nginx:buildx-woggioni
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 0c7e519..1488999 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -97,7 +97,7 @@ RUN --mount=type=cache,target=/var/cache/apk apk del .install_deps
 
 COPY --from=build /home/luser/libressl/openssl.cnf /etc/ssl/openssl.cnf
 COPY conf/nginx.conf /etc/nginx/nginx.conf
-COPY conf/nginx.vh.no-default.conf /etc/nginx/conf.d/default.conf
+COPY conf/nginx.vh.no-default.conf /etc/nginx/conf.d/http/default.conf
 COPY conf/dhparam /etc/nginx/dhparam
 
 LABEL description="NGINX Docker built top of LibreSSL" \
diff --git a/nginx/conf/nginx.conf b/nginx/conf/nginx.conf
index e9f7c32..e517b74 100644
--- a/nginx/conf/nginx.conf
+++ b/nginx/conf/nginx.conf
@@ -124,5 +124,6 @@ http {
         application/wasm;
 
 
-    include /etc/nginx/conf.d/*.conf;
+    include /etc/nginx/conf.d/http/*.conf;
+    include /etc/nginx/conf.d/stream/*.conf
 }