nginx: adapt to changed ubus socket path

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index 0b568739266422c079c71402e97157ff552094a3..0ad0d14887ff7d441c6dde06d899467185989173 100644 (file)
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx
 PKG_VERSION:=1.19.2
-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 b1fe358246ee8ff3fd7fd7f994d8301c7ab925fa..b2564444ca684f151bbe10761632732ce63efa20 100644 (file)
--- a/net/nginx/files-luci-support/60_nginx-luci-support
+++ b/net/nginx/files-luci-support/60_nginx-luci-support
@@ -6,13 +6,16 @@ if nginx -V 2>&1 | grep -q ubus; then
 
 location /ubus {
         ubus_interpreter;
-        ubus_socket_path /var/run/ubus.sock;
+        ubus_socket_path /var/run/ubus/ubus.sock;
         ubus_parallel_req 2;
 }
 EOT
        fi
 fi
 
+grep -q /var/run/ubus.sock /etc/nginx/conf.d/luci.locations &&
+       sed -i 's#/var/run/ubus.sock#/var/run/ubus/ubus.sock#' /etc/nginx/conf.d/luci.locations
+
 if [ -x /etc/init.d/uhttpd ]; then
         /etc/init.d/uhttpd disable
         if [ -n "$(pgrep uhttpd)" ]; then