Nanako/openwrt-app-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove public_address in html

Browse Source
This commit is contained in:
Janson 2022-02-17 18:21:51 +08:00 committed by GitHub
parent 4cc68add79
commit 31a6c1bb6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
applications/luci-app-ubuntu/luasrc/controller/ubuntu.lua
View File

@ -27,7 +27,13 @@ function container_status()
local container_install = (string.len(container_id) > 0)
local container_running = container_install and (string.len(util.trim(util.exec("docker ps -qf 'id="..container_id.."'"))) > 0)
local port = tonumber(uci:get_first(keyword, keyword, "port", "6901"))
local public_address = util.exec("curl cip.cc | grep \"IP\" | grep -oE '[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}' | tr -d '\n'")
local wan_status = util.ubus("network.interface.wan", "status", { })
local public_address = ""
if wan_status["ipv4-address"] and wan_status["ipv4-address"][1] and wan_status["ipv4-address"][1]["address"] then
public_address = wan_status["ipv4-address"][1]["address"]
end
-- local nxfs = require "nixio.fs"
-- nxfs.writefile("/tmp/test.log", dump["ipv4-address"][1]["address"])
local status = {
docker_install = docker_install,
docker_start = docker_running,

2
applications/luci-app-ubuntu/luasrc/view/ubuntu/ubuntu.htm
View File

@ -12,8 +12,6 @@
var configs = [
{id: "userName", label: "<%:UserName%>:", value: st.user_name},
{id: "password", label: "<%:Password%>:", value: st.password},
{id: "localAddress", label: "<%:LanAddress%>:", value: st.local_address},
{id: "publicAddress", label: "<%:WanAddress%>:", value: st.public_address},
];
configs.forEach(function(c){
htmlStr += ("<div class=\"cbi-value\"><label class=\"cbi-value-title\" for=\"" + c.id + "\">" + c.label + "</label>"