From bef91474bd2d4023b367c6e92f64103a9bda8ce4 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 13 Mar 2020 23:57:19 +0100 Subject: [PATCH] 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 (cherry picked from commit 38289bc97512e758e5a20f348dc13d5018f98188) --- modules/luci-base/luasrc/view/header.htm | 2 +- modules/luci-base/root/etc/config/luci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/luci-base/luasrc/view/header.htm b/modules/luci-base/luasrc/view/header.htm index f0f69f200..be18d3dec 100644 --- 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 daa4a5b7c..46947ae4c 100644 --- 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/" -- 2.25.1