OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update-02.05

This commit is contained in:
github-actions[bot] 2022-02-05 16:09:14 +08:00
parent 6af65ca521
commit 4acabb9ed5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua
View File

@ -715,6 +715,14 @@ elseif action == "console" then
return return
end end
local ttyd_ssl = uci.get("ttyd", "@ttyd[0]", "ssl")
local ttyd_ssl_key = uci.get("ttyd", "@ttyd[0]", "ssl_key")
local ttyd_ssl_cert = uci.get("ttyd", "@ttyd[0]", "ssl_cert")
if ttyd_ssl=="1" and ttyd_ssl_cert and ttyd_ssl_key then
cmd_ttyd=string.format('%s -S -C %s -K %s',cmd_ttyd,ttyd_ssl_cert,ttyd_ssl_key)
end
local pid = luci.util.trim(luci.util.exec("netstat -lnpt | grep :7682 | grep ttyd | tr -s ' ' | cut -d ' ' -f7 | cut -d'/' -f1")) local pid = luci.util.trim(luci.util.exec("netstat -lnpt | grep :7682 | grep ttyd | tr -s ' ' | cut -d ' ' -f7 | cut -d'/' -f1"))
if pid and pid ~= "" then if pid and pid ~= "" then
luci.util.exec("kill -9 " .. pid) luci.util.exec("kill -9 " .. pid)

2
luci-app-dockerman/luasrc/view/dockerman/container_console.htm
View File

@ -2,5 +2,5 @@
<iframe id="terminal" style="width: 100%; min-height: 500px; border: none; border-radius: 3px;"></iframe> <iframe id="terminal" style="width: 100%; min-height: 500px; border: none; border-radius: 3px;"></iframe>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
document.getElementById("terminal").src = "http://" + window.location.hostname + ":7682"; document.getElementById("terminal").src = window.location.protocol + "//" + window.location.hostname + ":7682";
</script> </script>