Skip to content

Commit

Permalink
fix #144
Browse files Browse the repository at this point in the history
  • Loading branch information
lisaac committed Feb 26, 2022
1 parent f2160ac commit 5a2e504
Showing 1 changed file with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -714,13 +714,14 @@ elseif action == "console" then
if not cmd_docker or not cmd_ttyd or cmd_docker:match("^%s+$") or cmd_ttyd:match("^%s+$") then
return
end
local uci = (require "luci.model.uci").cursor()

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")
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)
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"))
Expand All @@ -729,7 +730,6 @@ elseif action == "console" then
end

local hosts
local uci = (require "luci.model.uci").cursor()
local remote = uci:get_bool("dockerd", "dockerman", "remote_endpoint") or false
local host = nil
local port = nil
Expand Down

0 comments on commit 5a2e504

Please sign in to comment.