4 files changed, 30 insertions, 16 deletions

diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc
index 2714c3d22f..bcc384bd8a 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx.inc
+++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
@@ -38,7 +38,7 @@ NGINX_USER   ?= "www"
 EXTRA_OECONF = ""
 DISABLE_STATIC = ""
 
-PACKAGECONFIG ??= "ssl ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
+PACKAGECONFIG ??= "ssl fastcgi scgi uwsgi ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
 
 PACKAGECONFIG[gunzip] = "--with-http_gunzip_module,,"
 PACKAGECONFIG[http2] = "--with-http_v2_module,,"
@@ -48,7 +48,9 @@ PACKAGECONFIG[ipv6] = "--with-ipv6,,"
 PACKAGECONFIG[webdav] = "--with-http_dav_module,,"
 PACKAGECONFIG[stream] = "--with-stream,,"
 PACKAGECONFIG[http-sub-module] = "--with-http_sub_module,,"
-
+PACKAGECONFIG[fastcgi] = ",--without-http_fastcgi_module,"
+PACKAGECONFIG[scgi] = ",--without-http_scgi_module,"
+PACKAGECONFIG[uwsgi] = ",--without-http_uwsgi_module,"
 PACKAGECONFIG[xslt] = "--with-http_xslt_module,,libxslt"
 
 do_configure () {
@@ -81,9 +83,9 @@ do_configure () {
     --error-log-path=${localstatedir}/log/nginx/error.log \
     --http-client-body-temp-path=/run/nginx/client_body_temp \
     --http-proxy-temp-path=/run/nginx/proxy_temp \
-    --http-fastcgi-temp-path=/run/nginx/fastcgi_temp \
-    --http-uwsgi-temp-path=/run/nginx/uwsgi_temp \
-    --http-scgi-temp-path=/run/nginx/scgi_temp \
+    ${@bb.utils.contains('PACKAGECONFIG', 'fastcgi', '--http-fastcgi-temp-path=/run/nginx/fastcgi_temp', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'scgi', '--http-scgi-temp-path=/run/nginx/scgi_temp', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'uwsgi', '--http-uwsgi-temp-path=/run/nginx/uwsgi_temp', '', d)} \
     --pid-path=/run/nginx/nginx.pid \
     --prefix=${prefix} \
     --with-threads \
@@ -132,6 +134,18 @@ do_install () {
     # cleanup configuration folder
     rm ${D}${sysconfdir}/nginx/*.default
 
+    # remove config files based on packageconfig
+    if ! [ "${@bb.utils.filter('PACKAGECONFIG', 'fastcgi', d)}" ]; then
+        rm -f ${D}${sysconfdir}/nginx/fastcgi.conf
+        rm -f ${D}${sysconfdir}/nginx/fastcgi_params
+    fi
+    if ! [ "${@bb.utils.filter('PACKAGECONFIG', 'scgi', d)}" ]; then
+        rm -f ${D}${sysconfdir}/nginx/scgi_params
+    fi
+    if ! [ "${@bb.utils.filter('PACKAGECONFIG', 'uwsgi', d)}" ]; then
+        rm -f ${D}${sysconfdir}/nginx/uwsgi_params
+    fi
+
     # add additional configuration folders
     install -d ${D}${sysconfdir}/nginx/modules-available
     install -d ${D}${sysconfdir}/nginx/modules-enabled
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb
deleted file mode 100644
index d0371dd3cc..0000000000
--- a/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require nginx.inc
-
-# 1.24.x branch is the current stable branch, the recommended default
-# 1.25.x is the current mainline branches containing all new features
-DEFAULT_PREFERENCE = "-1"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=79ad2eb837299421c4435dedc8897b3d"
-
-SRC_URI[sha256sum] = "64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86"
-
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.26.0.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.26.3.bb
index 0ce940d429..7eab7ecdf5 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx_1.26.0.bb
+++ b/meta-webserver/recipes-httpd/nginx/nginx_1.26.3.bb
@@ -2,5 +2,5 @@ require nginx.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a6547d7e5628787ee2a9c5a3480eb628"
 
-SRC_URI[sha256sum] = "d2e6c8439d6c6db5015d8eaab2470ab52aef85a7bf363182879977e084370497"
+SRC_URI[sha256sum] = "69ee2b237744036e61d24b836668aad3040dda461fe6f570f1787eab570c75aa"
 
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.27.4.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.27.4.bb
new file mode 100644
index 0000000000..6c32ea7315
--- /dev/null
+++ b/meta-webserver/recipes-httpd/nginx/nginx_1.27.4.bb
@@ -0,0 +1,10 @@
+require nginx.inc
+
+# 1.26.x branch is the current stable branch, the recommended default
+# 1.27.x is the current mainline branches containing all new features
+DEFAULT_PREFERENCE = "-1"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3dc49537b08b14c8b66ad247bb4c4593"
+
+SRC_URI[sha256sum] = "294816f879b300e621fa4edd5353dd1ec00badb056399eceb30de7db64b753b2"
+