From 6b94e1d07ceecf22d73b39d0dbd8aaa786c4e338 Mon Sep 17 00:00:00 2001 From: shy Date: Sat, 2 Mar 2024 19:03:35 +0800 Subject: [PATCH] add some --- src/template/web.serve/local.sh | 8 ++++++-- src/template/web.serve/location.conf | 9 +++++++++ src/template/web.serve/server.conf | 11 +++++++++++ src/template/web.serve/upstream.conf | 3 +++ usr/local/export/web.chat.script/zone.csv | 2 +- 5 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 src/template/web.serve/location.conf create mode 100644 src/template/web.serve/server.conf create mode 100644 src/template/web.serve/upstream.conf diff --git a/src/template/web.serve/local.sh b/src/template/web.serve/local.sh index 08c41b02..514a7abf 100644 --- a/src/template/web.serve/local.sh +++ b/src/template/web.serve/local.sh @@ -1,3 +1,7 @@ +# for p in `ls {{.Option "pwd"}}/../*/etc/local.sh`; do source $p; done +# source {{.Option "pwd"}}/etc/local.sh + CTX_ROOT={{.Option "pwd"}} -su - {{.Option "user"}} -c "cd {{.Option "pwd"}} && ./bin/ice.bin forever start {{.Option "args"}} &" -for p in `ls usr/local/work/*/etc/local.sh`; do source $p; done +su - {{.Option "user"}} -c 'cd {{.Option "pwd"}} && ./bin/ice.bin forever start {{.Option "args"}} &' + +for p in `ls usr/local/work/*/etc/local.sh`; do source $p; done \ No newline at end of file diff --git a/src/template/web.serve/location.conf b/src/template/web.serve/location.conf new file mode 100644 index 00000000..a5f8a84e --- /dev/null +++ b/src/template/web.serve/location.conf @@ -0,0 +1,9 @@ +location / { + include header/proxy.conf; + proxy_pass http://{{.Option "name"}}; +} +location /space/ { + include header/proxy.conf; + include header/websocket.conf; + proxy_pass http://{{.Option "name"}}; +} diff --git a/src/template/web.serve/server.conf b/src/template/web.serve/server.conf new file mode 100644 index 00000000..bf2220c9 --- /dev/null +++ b/src/template/web.serve/server.conf @@ -0,0 +1,11 @@ +server { + listen 443 ssl; + server_name {{.Option "name"}}.shylinux.com; + include portal/{{.Option "name"}}/location.conf; +} +server { + listen 80; + server_name {{.Option "name"}}.shylinux.com; + include portal/{{.Option "name"}}/location.conf; + # include location/tohttps.conf; +} diff --git a/src/template/web.serve/upstream.conf b/src/template/web.serve/upstream.conf new file mode 100644 index 00000000..020ff2aa --- /dev/null +++ b/src/template/web.serve/upstream.conf @@ -0,0 +1,3 @@ +upstream {{.Option "name"}} { + server 127.0.0.1:{{.Option "port"}}; +} diff --git a/usr/local/export/web.chat.script/zone.csv b/usr/local/export/web.chat.script/zone.csv index f793c07a..24cd88a2 100644 --- a/usr/local/export/web.chat.script/zone.csv +++ b/usr/local/export/web.chat.script/zone.csv @@ -1,7 +1,7 @@ zone,time,id,space,index,play,status,style,extra devops,2024-01-21 13:39:29.910,1,20220826-career,ssh.relay,upgrade,enable,, devops,2024-01-21 13:41:00.072,2,20220826-career,ssh.relay,version,enable,, -devops,2024-01-21 13:41:39.611,3,20220826-career,ssh.relay,stats,enable,, +devops,2024-01-21 13:41:39.611,3,20220826-career,ssh.relay,stats,disable,, devops,2024-01-21 12:45:07.059,4,,status,pull,disable,, devops,2024-01-21 12:45:18.709,5,,compile,devpack,enable,, devops,2024-01-21 12:45:20.759,6,,compile,binpack,enable,,