Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nginx: adapt to changed ubus socket path

Browse source 
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2020-10-22 15:44:01 +01:00 committed by Hannu Nyman
parent 9d9669c2ff
commit c8bfe55026
2 changed files with 5 additions and 2 deletions
Show stats 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.19.2 PKG_VERSION:=1.19.2
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/

5
net/nginx/files-luci-support/60_nginx-luci-support
View file

@ -6,13 +6,16 @@ if nginx -V 2>&1 | grep -q ubus; then
location /ubus { location /ubus {
ubus_interpreter; ubus_interpreter;
ubus_socket_path /var/run/ubus.sock; ubus_socket_path /var/run/ubus/ubus.sock;
ubus_parallel_req 2; ubus_parallel_req 2;
} }
EOT EOT
fi fi
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 if [ -x /etc/init.d/uhttpd ]; then
/etc/init.d/uhttpd disable /etc/init.d/uhttpd disable
if [ -n "$(pgrep uhttpd)" ]; then if [ -n "$(pgrep uhttpd)" ]; then