Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3517 from Ansuel/ubus_short

Browse source 
luci-base: make rpc webserver path configurable
This commit is contained in:
Jo-Philipp Wich 2020-01-16 15:33:25 +01:00 committed by GitHub
commit f545b29aaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/luci-base/htdocs/luci-static/resources/luci.js
View file

@ -1508,8 +1508,8 @@
if (rpcBaseURL == null) { if (rpcBaseURL == null) {
var rpcFallbackURL = this.url('admin/ubus'); var rpcFallbackURL = this.url('admin/ubus');
rpcBaseURL = Request.get('/ubus/').then(function(res) { rpcBaseURL = Request.get(this.env.ubuspath).then(function(res) {
return (rpcBaseURL = (res.status == 400) ? '/ubus/' : rpcFallbackURL); return (rpcBaseURL = (res.status == 400) ? L.env.ubuspath : rpcFallbackURL);
}, function() { }, function() {
return (rpcBaseURL = rpcFallbackURL); return (rpcBaseURL = rpcFallbackURL);
}).then(function(url) { }).then(function(url) {

1
modules/luci-base/luasrc/view/header.htm
View file

@ -24,6 +24,7 @@
requestpath = luci.dispatcher.context.requestpath, requestpath = luci.dispatcher.context.requestpath,
dispatchpath = luci.dispatcher.context.path, dispatchpath = luci.dispatcher.context.path,
pollinterval = luci.config.main.pollinterval or 5, pollinterval = luci.config.main.pollinterval or 5,
ubuspath = luci.config.main.ubuspath or '/ubus',
sessionid = luci.dispatcher.context.authsession, sessionid = luci.dispatcher.context.authsession,
apply_rollback = math.max(applyconf and applyconf.rollback or 30, 30), apply_rollback = math.max(applyconf and applyconf.rollback or 30, 30),
apply_holdoff = math.max(applyconf and applyconf.holdoff or 4, 1), apply_holdoff = math.max(applyconf and applyconf.holdoff or 4, 1),

1
modules/luci-base/root/etc/config/luci
View file

@ -2,6 +2,7 @@ config core main
option lang auto option lang auto
option mediaurlbase /luci-static/bootstrap option mediaurlbase /luci-static/bootstrap
option resourcebase /luci-static/resources option resourcebase /luci-static/resources
option ubuspath /ubus
config extern flash_keep config extern flash_keep
option uci "/etc/config/" option uci "/etc/config/"