From d59abd0ab84959f51d0d554b0ed30676777bf794 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, 28 Feb 2025 15:16:15 +0800 Subject: [PATCH] Update serv00keep.sh --- serv00keep.sh | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/serv00keep.sh b/serv00keep.sh index 7f33ab9..98c4f69 100644 --- a/serv00keep.sh +++ b/serv00keep.sh @@ -101,25 +101,6 @@ okip(){ echo "$IP" } -# Generating argo Config -argo_configure() { - if [[ $ARGO_AUTH =~ TunnelSecret ]]; then - echo $ARGO_AUTH > tunnel.json - cat > tunnel.yml << EOF -tunnel: $(cut -d\" -f12 <<< "$ARGO_AUTH") -credentials-file: tunnel.json -protocol: http2 - -ingress: - - hostname: $ARGO_DOMAIN - service: http://localhost:$vmess_port - originRequest: - noTLSVerify: true - - service: http_status:404 -EOF - fi -} - uuidport(){ if [[ -z "$UUID" ]]; then if [ ! -e UUID.txt ]; then @@ -214,16 +195,8 @@ export hy2_port=$udp_port download_and_run_singbox() { if [ ! -s sb.txt ] && [ ! -s ag.txt ]; then - ARCH=$(uname -m) && DOWNLOAD_DIR="." && mkdir -p "$DOWNLOAD_DIR" && FILE_INFO=() - if [ "$ARCH" == "arm" ] || [ "$ARCH" == "arm64" ] || [ "$ARCH" == "aarch64" ]; then - FILE_INFO=("https://github.com/eooce/test/releases/download/arm64/sb web" "https://github.com/eooce/test/releases/download/arm64/bot13 bot") - elif [ "$ARCH" == "amd64" ] || [ "$ARCH" == "x86_64" ] || [ "$ARCH" == "x86" ]; then - FILE_INFO=("https://github.com/yonggekkk/Cloudflare_vless_trojan/releases/download/serv00/sb web" "https://github.com/yonggekkk/Cloudflare_vless_trojan/releases/download/serv00/server bot") - else - echo "Unsupported architecture: $ARCH" - exit 1 - fi - +DOWNLOAD_DIR="." && mkdir -p "$DOWNLOAD_DIR" && FILE_INFO=() +FILE_INFO=("https://github.com/yonggekkk/Cloudflare_vless_trojan/releases/download/serv00/sb web" "https://github.com/yonggekkk/Cloudflare_vless_trojan/releases/download/serv00/server bot") declare -A FILE_MAP generate_random_name() { local chars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890 @@ -500,8 +473,6 @@ if [ -e "$(basename "${FILE_MAP[bot]}")" ]; then if [[ $ARGO_AUTH =~ ^[A-Z0-9a-z=]{120,250}$ ]]; then #args="tunnel --edge-ip-version auto --no-autoupdate --protocol http2 run --token ${ARGO_AUTH}" args="tunnel --no-autoupdate run --token ${ARGO_AUTH}" - elif [[ $ARGO_AUTH =~ TunnelSecret ]]; then - args="tunnel --edge-ip-version auto --config tunnel.yml run" else #args="tunnel --edge-ip-version auto --no-autoupdate --protocol http2 --logfile boot.log --loglevel info --url http://localhost:$vmess_port" args="tunnel --url http://localhost:$vmess_port --no-autoupdate --logfile boot.log --loglevel info" @@ -522,8 +493,6 @@ else if [[ $ARGO_AUTH =~ ^[A-Z0-9a-z=]{120,250}$ ]]; then #args="tunnel --edge-ip-version auto --no-autoupdate --protocol http2 run --token ${ARGO_AUTH}" args="tunnel --no-autoupdate run --token ${ARGO_AUTH}" - elif [[ $ARGO_AUTH =~ TunnelSecret ]]; then - args="tunnel --edge-ip-version auto --config tunnel.yml run" else #args="tunnel --edge-ip-version auto --no-autoupdate --protocol http2 --logfile boot.log --loglevel info --url http://localhost:$vmess_port" args="tunnel --url http://localhost:$vmess_port --no-autoupdate --logfile boot.log --loglevel info" @@ -1175,7 +1144,6 @@ rm -rf $HOME/domains/${snb}.${USERNAME}.serv00.net/logs/* install_singbox() { cd $WORKDIR read_ip -argo_configure uuidport download_and_run_singbox get_links