[openwrt/openwrt] uhttpd: Reload config after uhttpd-mod-ubus was added

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/97a4d27fb5707d3a0b943f2af326b04d26f98731

commit 97a4d27fb5707d3a0b943f2af326b04d26f98731
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Sat Mar 20 13:19:22 2021 +0100

    uhttpd: Reload config after uhttpd-mod-ubus was added
    
    Without this change the config is only committed, but the uhttpd daemon
    is not reloaded. This reload is needed to apply the config. Without the
    reload of uhttpd, the ubus server is not available over http and returns
    a Error 404.
    
    This caused problems when installing luci on the snapshots and
    accessing it without reloading uhttpd.
    
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
    (cherry picked from commit d25d281fd6686bda67636f6c1df918145b6cb738)
---
 package/network/services/uhttpd/Makefile           | 2 +-
 package/network/services/uhttpd/files/ubus.default | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile
index 796eb61298..28a817d2e0 100644
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uhttpd
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git
diff --git a/package/network/services/uhttpd/files/ubus.default b/package/network/services/uhttpd/files/ubus.default
index ca9e72a315..b218d3f85d 100644
--- a/package/network/services/uhttpd/files/ubus.default
+++ b/package/network/services/uhttpd/files/ubus.default
@@ -3,11 +3,13 @@
 if [ -z "$(uci -q get uhttpd.main.ubus_prefix)" ]; then
 	uci set uhttpd.main.ubus_prefix=/ubus
 	uci commit uhttpd
+	/etc/init.d/uhttpd reload
 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
+	/etc/init.d/uhttpd reload
 }
 
 exit 0