ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-02 09:18:05 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

uhttpd: adapt defaults for changes ubus.sock path

Browse Source 
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2020-10-22 15:02:42 +01:00
parent de7ca7dafa
commit 061904d7e3
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/uhttpd/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd PKG_NAME:=uhttpd
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git

5
package/network/services/uhttpd/files/ubus.default
View File

@ -5,4 +5,9 @@ if [ -z "$(uci -q get uhttpd.main.ubus_prefix)" ]; then
uci commit uhttpd uci commit uhttpd
fi fi
[ "$(uci -q get uhttpd.main.ubus_socket)" = "/var/run/ubus.sock" ] && {
uci set uhttpd.main.ubus_socket='/var/run/ubus/ubus.sock'
uci commit uhttpd
}
exit 0 exit 0

2
package/network/services/uhttpd/files/uhttpd.config
View File

@ -59,7 +59,7 @@ config uhttpd main
# Specify the ubus-rpc prefix and socket path. # Specify the ubus-rpc prefix and socket path.
# option ubus_prefix /ubus # option ubus_prefix /ubus
# option ubus_socket /var/run/ubus.sock # option ubus_socket /var/run/ubus/ubus.sock
# CGI/Lua timeout, if the called script does not # CGI/Lua timeout, if the called script does not
# write data within the given amount of seconds, # write data within the given amount of seconds,