openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 23:34:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

nginx: drop deprecated luci.module in module.d

Browse Source 
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: caffa410ed ("nginx: autoload dynamic modules")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi
2024-05-09 19:29:36 +02:00
parent 3aa746b246
commit 4c4e49064a
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/nginx/Makefile
View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nginx PKG_NAME:=nginx
PKG_VERSION:=1.25.5 PKG_VERSION:=1.25.5
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://nginx.org/download/ PKG_SOURCE_URL:=https://nginx.org/download/

7
net/nginx/files-luci-support/60_nginx-luci-support
View File

@@ -12,11 +12,8 @@ location /ubus {
EOT EOT
fi fi
if [ ! -f "/etc/nginx/module.d/ngx_http_ubus.module" ]; then # Drop old reference of luci.module as we migrated to a more automatic approach
cat <<EOT > /etc/nginx/module.d/ngx_http_ubus.module [ -f "/etc/nginx/module.d/luci.module" ] && rm /etc/nginx/module.d/luci.module
load_module /usr/lib/nginx/modules/ngx_http_ubus_module.so;
EOT
fi
fi fi
grep -q /var/run/ubus.sock /etc/nginx/conf.d/luci.locations && grep -q /var/run/ubus.sock /etc/nginx/conf.d/luci.locations &&