diff --git a/base/web/serve.go b/base/web/serve.go index 1d999916..d5994ff2 100644 --- a/base/web/serve.go +++ b/base/web/serve.go @@ -209,6 +209,7 @@ const ( OPS_SERVER_OPEN = "ops.server.open" SERVE_START = "serve.start" + PROXY_CONF = "proxyConf" ) const SERVE = "serve" @@ -241,6 +242,14 @@ func init() { ssh.PrintQRCode(m, tcp.PublishLocalhost(m, _serve_address(m))) cli.Opens(m, mdb.Config(m, cli.OPEN)) }) + m.Cmd("", PROXY_CONF, ice.Info.NodeName) + }}, + PROXY_CONF: {Name: "proxyConf name* port path", Hand: func(m *ice.Message, arg ...string) { + if dir := m.OptionDefault(nfs.PATH, "usr/local/daemon/10000/"); nfs.Exists(m, dir) { + for _, p := range []string{"server.conf", "location.conf", "upstream.conf"} { + m.Cmd(nfs.SAVE, kit.Format("%s/conf/portal/%s/%s", dir, m.Option(mdb.NAME), p), m.Template(p)+lex.NL) + } + } }}, }, gdb.EventsAction(SERVE_START), mdb.HashAction(mdb.SHORT, mdb.NAME, mdb.FIELD, "time,status,name,proto,host,port"), mdb.ClearOnExitHashAction()), Hand: func(m *ice.Message, arg ...string) { mdb.HashSelect(m, arg...).Action().StatusTimeCount(kit.Dict(ice.MAIN, mdb.Config(m, ice.MAIN))) diff --git a/base/web/spide.go b/base/web/spide.go index da0d4edf..ac10b646 100644 --- a/base/web/spide.go +++ b/base/web/spide.go @@ -359,10 +359,7 @@ func init() { DEV_CREATE_TOKEN: {Hand: func(m *ice.Message, arg ...string) { m.Cmd(SPACE, tcp.DIAL, ice.DEV, m.Option(CLIENT_NAME), m.OptionSimple(TOKEN)).Sleep300ms() }}, - }, DevTokenAction(CLIENT_NAME, CLIENT_URL), - mdb.HashAction(mdb.SHORT, CLIENT_NAME, mdb.FIELD, "time,icons,client.name,client.url,client.type,token"), - mdb.ImportantHashAction(), - ), Hand: func(m *ice.Message, arg ...string) { + }, DevTokenAction(CLIENT_NAME, CLIENT_URL), mdb.ImportantHashAction(mdb.SHORT, CLIENT_NAME, mdb.FIELD, "time,icons,client.name,client.url,client.type,token")), Hand: func(m *ice.Message, arg ...string) { if len(arg) < 2 || arg[0] == "" || (len(arg) > 3 && arg[3] == "") { list := m.CmdMap(SPACE, mdb.NAME) mdb.HashSelect(m, kit.Slice(arg, 0, 1)...).Sort("client.type,client.name", []string{nfs.REPOS, ""})