From: Christian Marangi <redacted>
Date: Thu, 9 May 2024 17:29:36 +0000 (+0200)
Subject: nginx: drop deprecated luci.module in module.d
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=4c4e49064a4a9c87fc15e58af86e2ffc0a0d12dc;p=openwrt-packages.git

nginx: drop deprecated luci.module in module.d

Since we moved to automatic loading of dynamic modules, we need to drop
the previous include luci.module or we end up with nginx failing to
start for old configurations.

Fixes: caffa410ed70 ("nginx: autoload dynamic modules")
Signed-off-by: Christian Marangi <redacted>
---

diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index 3135fab7e..46d039012 100644
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx
 PKG_VERSION:=1.25.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://nginx.org/download/
diff --git a/net/nginx/files-luci-support/60_nginx-luci-support b/net/nginx/files-luci-support/60_nginx-luci-support
index 4967246ee..8f1eef44e 100644
--- a/net/nginx/files-luci-support/60_nginx-luci-support
+++ b/net/nginx/files-luci-support/60_nginx-luci-support
@@ -12,11 +12,8 @@ location /ubus {
 EOT
 	fi
 
-        if [ ! -f "/etc/nginx/module.d/ngx_http_ubus.module" ]; then
-		cat <<EOT > /etc/nginx/module.d/ngx_http_ubus.module
-load_module /usr/lib/nginx/modules/ngx_http_ubus_module.so;
-EOT
-	fi
+        # Drop old reference of luci.module as we migrated to a more automatic approach
+        [ -f "/etc/nginx/module.d/luci.module" ] && rm /etc/nginx/module.d/luci.module
 fi
 
 grep -q /var/run/ubus.sock /etc/nginx/conf.d/luci.locations &&