luci-base: ensure that ubus path uses trailing slash

Without the trailing slash, probing endpoint availability will fail.

Fixes: 529bde440 ("luci-base: make rpc webserver path configurable")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 38289bc97512e758e5a20f348dc13d5018f98188)

diff --git a/modules/luci-base/luasrc/view/header.htm b/modules/luci-base/luasrc/view/header.htm
index f0f69f2003a9523588fda505027ad6e4976a31dd..be18d3dec258a99b4e46d2e0b68e64e9565414d0 100644 (file)
--- a/modules/luci-base/luasrc/view/header.htm
+++ b/modules/luci-base/luasrc/view/header.htm
@@ -26,7 +26,7 @@
                requestpath    = luci.dispatcher.context.requestpath,
                dispatchpath   = luci.dispatcher.context.path,
                pollinterval   = luci.config.main.pollinterval or 5,
-               ubuspath       = luci.config.main.ubuspath or '/ubus',
+               ubuspath       = luci.config.main.ubuspath or '/ubus/',
                sessionid      = luci.dispatcher.context.authsession,
                apply_rollback = math.max(applyconf and applyconf.rollback or 30, 30),
                apply_holdoff  = math.max(applyconf and applyconf.holdoff or 4, 1),

diff --git a/modules/luci-base/root/etc/config/luci b/modules/luci-base/root/etc/config/luci
index daa4a5b7c931022942302352b9d4bc3a4c4abd75..46947ae4c1873d13cf737695e94633b42c3c241b 100644 (file)
--- a/modules/luci-base/root/etc/config/luci
+++ b/modules/luci-base/root/etc/config/luci
@@ -2,7 +2,7 @@ config core main
        option lang auto
        option mediaurlbase /luci-static/bootstrap
        option resourcebase /luci-static/resources
-       option ubuspath /ubus
+       option ubuspath /ubus/
        
 config extern flash_keep
        option uci              "/etc/config/"