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 <ansuelsmth@gmail.com>

diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index 3135fab7e62b9d1b58f73957c3bb827674ca7be6..46d039012afcbe6b70bdc8c25635b1fd40bcef0a 100644 (file)
--- 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 4967246eebbecfa5e889291d67d01cf9ad4ffa51..8f1eef44e79d0387544cab831487586e78386ab6 100644 (file)
--- 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 &&