From 0c8380b00265e3f66dc7d68a60dabec8e7310bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=AC=E5=93=A5=E4=BE=83=E4=BE=83=E4=BE=83ygkkk?= <121604513+yonggekkk@users.noreply.github.com> Date: Fri, 21 Feb 2025 08:34:43 +0800 Subject: [PATCH 1/2] Update serv00.sh --- serv00.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/serv00.sh b/serv00.sh index 2241108..8af5d60 100644 --- a/serv00.sh +++ b/serv00.sh @@ -200,7 +200,8 @@ reading "\n清理所有进程并清空所有安装内容,将退出ssh连接, case "$choice" in [Yy]) bash -c 'ps aux | grep $(whoami) | grep -v "sshd\|bash\|grep" | awk "{print \$2}" | xargs -r kill -9 >/dev/null 2>&1' >/dev/null 2>&1 - rm -rf domains bin serv00keep.sh + devil www del ${snb}.${USERNAME}.serv00.net > /dev/null 2>&1 + devil www del ${USERNAME}.serv00.net > /dev/null 2>&1 sed -i '/export PATH="\$HOME\/bin:\$PATH"/d' "${HOME}/.bashrc" >/dev/null 2>&1 source "${HOME}/.bashrc" >/dev/null 2>&1 #crontab -l | grep -v "serv00keep" >rmcron From 3f816a1d2f3c509c51d69369a6eff851cca1cc75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=AC=E5=93=A5=E4=BE=83=E4=BE=83=E4=BE=83ygkkk?= <121604513+yonggekkk@users.noreply.github.com> Date: Fri, 21 Feb 2025 08:47:46 +0800 Subject: [PATCH 2/2] Update serv00.sh --- serv00.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/serv00.sh b/serv00.sh index 8af5d60..6027289 100644 --- a/serv00.sh +++ b/serv00.sh @@ -553,7 +553,7 @@ for ((i=1; i<=5; i++)); do break fi if [[ $i -eq 5 ]]; then - red "$agg Argo进程重启失败" + red "$agg Argo进程重启失败,Argo节点暂不可用(保活过程中会自动恢复),其他节点依旧可用" fi done fi @@ -587,7 +587,7 @@ get_argodomain() { sleep 2 done if [ -z ${argodomain} ]; then - argodomain="Argo临时域名暂时获取失败,Argo节点暂不可用,其他节点依旧可用" + argodomain="Argo临时域名暂时获取失败,Argo节点暂不可用(保活过程中会自动恢复),其他节点依旧可用" fi echo "$argodomain" fi @@ -1384,7 +1384,7 @@ checkhttp=$(curl -o /dev/null -s -w "%{http_code}\n" "https://$argosl") green "Argo临时域名:$argosl $check" fi if [ -f "$WORKDIR/boot.log" ] && ! ps aux | grep '[t]unnel --u' > /dev/null; then -yellow "Argo临时域名暂时不存在,请刷新一下保活网页,稍后可再次进入脚本查看" +yellow "Argo临时域名暂时不存在,保活过程中会自动恢复" fi if ps aux | grep '[t]unnel --n' > /dev/null; then argogd=$(cat $WORKDIR/gdym.log 2>/dev/null) @@ -1395,6 +1395,7 @@ fi if [ ! -f "$WORKDIR/boot.log" ] && ! ps aux | grep '[t]unnel --n' > /dev/null; then yellow "Argo固定域名:$(cat $WORKDIR/gdym.log 2>/dev/null),启用失败,请检查相关参数是否输入有误" fi +echo green "多功能主页如下,支持网页保活、网页重启、网页节点查询" purple "http://${snb}.${USERNAME}.serv00.net" #if ! crontab -l 2>/dev/null | grep -q 'serv00keep'; then