gluon-config-mode-reboot-ffhh: Use a "pretty" hostname

This commit is contained in:
bdobe 2016-10-04 19:47:36 +02:00
parent 58a026ad0d
commit c9d083f523

View file

@ -4,18 +4,26 @@ local meshvpn_enabled = uci:get("fastd", "mesh_vpn", "enabled", "0")
if meshvpn_enabled == "1" then if meshvpn_enabled == "1" then
return nil return nil
else else
local gluon_luci = require 'gluon.luci'
local i18n = require "luci.i18n" local i18n = require "luci.i18n"
local site = require 'gluon.site_config' local site = require 'gluon.site_config'
local sysconfig = require 'gluon.sysconfig' local sysconfig = require 'gluon.sysconfig'
local hostname = uci:get_first("system", "system", "hostname") local pretty_hostname = require 'pretty_hostname'
local hostname = pretty_hostname.get(uci)
local msg = [[<p>]] .. i18n.translate('gluon-config-mode:nopubkey') .. [[</p>]] local msg = [[<p>]] .. i18n.translate('gluon-config-mode:nopubkey') .. [[</p>]]
return function () return function ()
luci.template.render_string(msg, { hostname=hostname luci.template.render_string(msg,
, site=site {
, sysconfig=sysconfig hostname=hostname,
}) site=site,
end sysconfig=sysconfig,
escape = gluon_luci.escape,
urlescape = gluon_luci.urlescape,
}
)
end
end end