diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2020-01-16 15:33:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-16 15:33:25 +0100 |
| commit | f545b29aaf6c63a74321a1e5e4655e71330b33b3 (patch) | |
| tree | 3a30dd3e7486ae34387a55aa8d6ceffcc656ea2c /modules | |
| parent | 267085cf2d498c34b92a6e8edae627b1705f88a2 (diff) | |
| parent | 529bde44081d0bc07a064e9dfb1f0b3f35e61061 (diff) | |
Merge pull request #3517 from Ansuel/ubus_short
luci-base: make rpc webserver path configurable
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/luci-base/htdocs/luci-static/resources/luci.js | 4 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/view/header.htm | 1 | ||||
| -rw-r--r-- | modules/luci-base/root/etc/config/luci | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/luci.js b/modules/luci-base/htdocs/luci-static/resources/luci.js index 808ab0c5cb..69e1929945 100644 --- a/modules/luci-base/htdocs/luci-static/resources/luci.js +++ b/modules/luci-base/htdocs/luci-static/resources/luci.js @@ -1508,8 +1508,8 @@ if (rpcBaseURL == null) { var rpcFallbackURL = this.url('admin/ubus'); - rpcBaseURL = Request.get('/ubus/').then(function(res) { - return (rpcBaseURL = (res.status == 400) ? '/ubus/' : rpcFallbackURL); + rpcBaseURL = Request.get(this.env.ubuspath).then(function(res) { + return (rpcBaseURL = (res.status == 400) ? L.env.ubuspath : rpcFallbackURL); }, function() { return (rpcBaseURL = rpcFallbackURL); }).then(function(url) { diff --git a/modules/luci-base/luasrc/view/header.htm b/modules/luci-base/luasrc/view/header.htm index 9cdedde5c2..6f7f0e48e7 100644 --- a/modules/luci-base/luasrc/view/header.htm +++ b/modules/luci-base/luasrc/view/header.htm @@ -24,6 +24,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', 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 82c2230e55..91a0193873 100644 --- a/modules/luci-base/root/etc/config/luci +++ b/modules/luci-base/root/etc/config/luci @@ -2,6 +2,7 @@ config core main option lang auto option mediaurlbase /luci-static/bootstrap option resourcebase /luci-static/resources + option ubuspath /ubus config extern flash_keep option uci "/etc/config/" |