opt some

Makefile

@@ -1,12 +1,12 @@
 binarys = bin/ice.bin
+option = src/option.go
 version = src/version.go
-binpack = src/binpack.go
 flags = -ldflags "-w -s" -v
 
 all: def
 	@date +"%Y-%m-%d %H:%M:%S"
-	go build ${flags} -o ${binarys} src/main.go src/option.go ${version} ${binpack} && ./${binarys} forever restart &>/dev/null
+	go build ${flags} -o ${binarys} src/main.go ${option} ${version} && ./${binarys} forever restart &>/dev/null
 
 def:
+	@[ -f ${option} ] || echo "package main">${option}
 	@[ -f ${version} ] || echo "package main">${version}
-	@[ -f ${binpack} ] || echo "package main">${binpack}

etc/local/2025.sh

@@ -3,6 +3,7 @@
 for p in `ls /root/*/etc/local.sh`; do source $p; done
 [ -d /tmp/nginx ] || mkdir /tmp/nginx; cd /opt/daemon/10000/ && $PWD/sbin/nginx -p $PWD &
 su - git -c 'cd /opt/daemon/10010/ && GITEA_WORK_DIR=$PWD/var/lib/gitea/ $PWD/usr/local/bin/gitea web -c $PWD/etc/gitea/app.ini &'
-su - mysql -c 'cd /opt/daemon/10001/ && ./bin/mysqld --basedir=./ --datadir=./data --plugin-dir=./lib/plugin --socket=mysqld.socket --log-error=mysqld.log --pid-file=mysqld.pid --port 10001 &'
+su - mysql -c 'cd /opt/daemon/10001/ && $PWD/bin/mysqld --basedir=./ --datadir=./data --plugin-dir=./lib/plugin --socket=mysqld.socket --log-error=mysqld.log --pid-file=mysqld.pid --port 10001 &'
-export DOCKER_HOST=unix:///opt/daemon/10002/docker.sock
 cd /opt/daemon/10002/ && $PWD/bin/dockerd --host unix://$PWD/docker.sock --pidfile $PWD/docker.pid --exec-root=$PWD/exec --data-root=$PWD/data --registry-mirror "https://ccr.ccs.tencentyun.com" --userland-proxy=false &
+export DOCKER_HOST=unix://$PWD/docker.sock
+# export DOCKER_HOST=unix:///opt/daemon/10002/docker.sock

go.mod

@@ -3,6 +3,6 @@ module shylinux.com/x/ContextOS
 go 1.13
 
 require (
-	shylinux.com/x/ice v1.5.69
+	shylinux.com/x/ice v1.5.73
-	shylinux.com/x/icebergs v1.9.71
+	shylinux.com/x/icebergs v1.9.75
 )

go.sum

@@ -2,12 +2,12 @@ shylinux.com/x/go-git/v5 v5.6.7 h1:WD5QSco7m3QooPCgdvQ6/GyGIFPun8C+hex5N41LYlk=
 shylinux.com/x/go-git/v5 v5.6.7/go.mod h1:Qb0lA+uIrofZg8NQerhYcJHgGWixFqvS6p3aJ/L5Nlk=
 shylinux.com/x/go-qrcode v0.0.3 h1:RMo+Vidbgq3HatLBj7DDXcTbTLFUwzis5K7TqBkD38U=
 shylinux.com/x/go-qrcode v0.0.3/go.mod h1:KAbtU+KwiiABMZ/CJ0zh9PI2AX82Uf9rRYcQ4ODm4po=
-shylinux.com/x/ice v1.5.69 h1:ooWBFiY6cfMmamyjiQvTRZIacyrg3Te+97iuGOQgp7k=
+shylinux.com/x/ice v1.5.73 h1:wp+KeQ14hLOdxxSou/Y0zHi48Jm4nLx1rFOwGz8ix04=
-shylinux.com/x/ice v1.5.69/go.mod h1:gZLXlXi58yWdW0HP3c4K/IFS8my43DId6ke3vvXiq1k=
+shylinux.com/x/ice v1.5.73/go.mod h1:uGI73gYkk+FiJt5qmy/aYhoKRJ4wobcJk3WrPGh8Waw=
-shylinux.com/x/icebergs v1.9.71 h1:h31b/MsEXinqDiVygbCLdiFVDLEhNpiwD4Q+U2tg/iU=
+shylinux.com/x/icebergs v1.9.75 h1:9zAm0ppwUWl0As/vqfQG/QR/vwXa5zmfdIGE/gmvErQ=
-shylinux.com/x/icebergs v1.9.71/go.mod h1:+4bl7yJRMFtlTQRDLd+xh6b0hwXkqWaHLmx63Jeewwk=
+shylinux.com/x/icebergs v1.9.75/go.mod h1:3Bdp3tjzw+hUKJF+kR8pfsrbjAf72DVZmCaE8/MPFtk=
 shylinux.com/x/toolkits v0.7.10/go.mod h1:CHDJarGlDkg60kVsvMLYL/a5hAnRLEOShiEsMOuEp0Q=
-shylinux.com/x/toolkits v1.0.18 h1:jtQZhmvU10Ajegc87tU0cYFUBSviaODo5TsCXpYb2O4=
+shylinux.com/x/toolkits v1.0.19 h1:Nrx0xYRc5ph1WS66EZ1hJUCe+2FdSWQ4QP6tBlguikQ=
-shylinux.com/x/toolkits v1.0.18/go.mod h1:CHDJarGlDkg60kVsvMLYL/a5hAnRLEOShiEsMOuEp0Q=
+shylinux.com/x/toolkits v1.0.19/go.mod h1:CHDJarGlDkg60kVsvMLYL/a5hAnRLEOShiEsMOuEp0Q=
 shylinux.com/x/websocket v0.0.4 h1:AJpwblePoOpiE6C8NrvgNYpKTotXMLrDDX2chTvx44Q=
 shylinux.com/x/websocket v0.0.4/go.mod h1:3UGWkjTu3ie5NAZen7J+uLPBrO7DFeKloj6Jxo13Oiw=

src/template/web.serve/local.sh

@@ -1,7 +1,8 @@
 # /etc/rc.local
 # source {{.Option "pwd"}}/etc/local.sh
-
 # for p in `ls {{.Option "pwd"}}/../*/etc/local.sh`; do source $p; done
-su - {{.Option "user"}} -c 'cd {{.Option "pwd"}} && {{.Option "pwd"}}/bin/ice.bin forever start {{.Option "args"}} &'
 
-for p in `ls {{.Option "pwd"}}/usr/local/work/*/etc/local.sh`; do source $p; done
+# su - {{.Option "user"}} -c 'cd {{.Option "pwd"}} && {{.Option "pwd"}}/bin/ice.bin forever start {{.Option "args"}} &'
+su - {{.Option "user"}} -c 'while true; do cd {{.Option "pwd"}} && {{.Option "pwd"}}/bin/ice.bin serve start {{.Option "args"}} &>var/log/boot.log && break; done &'
+
+for p in `ls {{.Option "pwd"}}/usr/local/work/*/etc/local.sh`; do source $p; done

src/template/web.serve/server.conf

@@ -1,11 +1,11 @@
 server {
 	listen       443 ssl;
-	server_name  {{.Option "name"}}.shylinux.com;
+	server_name  {{.Option "name"}}.{{.OptionDefault "ctx_domain" "shylinux.com"}};
 	include      portal/{{.Option "name"}}/location.conf;
 }
 server {
 	listen       80;
-	server_name  {{.Option "name"}}.shylinux.com;
+	server_name  {{.Option "name"}}.{{.OptionDefault "ctx_domain" "shylinux.com"}};
 	include      location/tohttps.conf;
 	# include      portal/{{.Option "name"}}/location.conf;
 }