diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2020-03-13 23:57:19 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2020-03-13 23:57:19 +0100 |
| commit | 38289bc97512e758e5a20f348dc13d5018f98188 (patch) | |
| tree | fe3dfd5834f0ae10e02cca6a0640ddc7d178aace /modules | |
| parent | 270c5f04e2972a66423d62ac3507439da2b1fd58 (diff) | |
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>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/luci-base/luasrc/view/header.htm | 2 | ||||
| -rw-r--r-- | 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 fbede8ff57..4d30729809 100644 --- a/modules/luci-base/luasrc/view/header.htm +++ b/modules/luci-base/luasrc/view/header.htm @@ -25,7 +25,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 daa4a5b7c9..46947ae4c1 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/" |