diff --git a/etc/local/2025.sh b/etc/local/2025.sh index fb197005..5edebbf2 100644 --- a/etc/local/2025.sh +++ b/etc/local/2025.sh @@ -2,8 +2,7 @@ # source /root/2025-ContextOS/etc/local/2025.sh 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 - 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 - 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 &' 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 & -# su - git -c 'GITEA_WORK_DIR=/var/lib/gitea/ /usr/local/bin/gitea web -c /etc/gitea/app.ini &' diff --git a/src/main.js b/src/main.js index 239cfcb5..85952c2c 100644 --- a/src/main.js +++ b/src/main.js @@ -36,7 +36,7 @@ Volcanos({river: { }}, operate: {name: "运维群", icon: "bi bi-shield-lock", nodetype: web.SERVER, type: aaa.TECH, storm: { user: {name: "用户 user", icon: "bi bi-people-fill", index: ["user", "sess", "role"]}, - oauth: {name: "登录 oauth", icon: "bi bi-shield-lock", index: ["header", "web.chat.password", "web.chat.oauth.client", "web.chat.wx.access"]}, + oauth: {name: "登录 oauth", icon: "bi bi-shield-lock", index: ["header", "web.chat.wx.access", "web.chat.oauth.client"]}, email: {name: "邮箱 email", icon: "bi bi-envelope", index: ["apply", "offer", "email"]}, share: {name: "共享 share", icon: "bi bi-share", index: ["share", "token", "qrcode", "web.product"]}, }}, diff --git a/src/template/web.serve/local.sh b/src/template/web.serve/local.sh index 9129bffe..b038a136 100644 --- a/src/template/web.serve/local.sh +++ b/src/template/web.serve/local.sh @@ -1,7 +1,7 @@ +# /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 \ No newline at end of file diff --git a/src/template/web.serve/server.conf b/src/template/web.serve/server.conf index bf2220c9..ff2095fd 100644 --- a/src/template/web.serve/server.conf +++ b/src/template/web.serve/server.conf @@ -6,6 +6,6 @@ server { server { listen 80; server_name {{.Option "name"}}.shylinux.com; - include portal/{{.Option "name"}}/location.conf; - # include location/tohttps.conf; + include location/tohttps.conf; + # include portal/{{.Option "name"}}/location.conf; }