From caa1ca4aadc49be2ad7451ca04649bf4b808b42e 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: Sat, 1 Mar 2025 11:32:21 +0800
Subject: [PATCH] Update serv00keep.sh

---
 serv00keep.sh | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/serv00keep.sh b/serv00keep.sh
index 366b3f6..b30695c 100644
--- a/serv00keep.sh
+++ b/serv00keep.sh
@@ -255,14 +255,9 @@ echo "${public_key}" > public_key.txt
 fi
 private_key=$(<private_key.txt)
 public_key=$(<public_key.txt)
-
 openssl ecparam -genkey -name prime256v1 -out "private.key"
 openssl req -new -x509 -days 3650 -key "private.key" -out "cert.pem" -subj "/CN=$USERNAME.serv00.net"
-
 nb=$(hostname | cut -d '.' -f 1 | tr -d 's')
-if [[ "$nb" =~ (14|15|16) ]]; then
-ytb='"jnn-pa.googleapis.com",'
-fi
 hy1p=$(sed -n '1p' hy2ip.txt)
 hy2p=$(sed -n '2p' hy2ip.txt)
 hy3p=$(sed -n '3p' hy2ip.txt)
@@ -275,7 +270,7 @@ hy3p=$(sed -n '3p' hy2ip.txt)
   },
     "inbounds": [
     {
-       "tag": "hysteria-in",
+       "tag": "hysteria-in1",
        "type": "hysteria2",
        "listen": "$hy1p",
        "listen_port": $hy2_port,
@@ -296,7 +291,7 @@ hy3p=$(sed -n '3p' hy2ip.txt)
         }
     },
         {
-       "tag": "hysteria-in",
+       "tag": "hysteria-in2",
        "type": "hysteria2",
        "listen": "$hy2p",
        "listen_port": $hy2_port,
@@ -317,7 +312,7 @@ hy3p=$(sed -n '3p' hy2ip.txt)
         }
     },
         {
-       "tag": "hysteria-in",
+       "tag": "hysteria-in3",
        "type": "hysteria2",
        "listen": "$hy3p",
        "listen_port": $hy2_port,
@@ -381,7 +376,7 @@ hy3p=$(sed -n '3p' hy2ip.txt)
       }
     }
  ],
-    "outbounds": [
+     "outbounds": [
      {
         "type": "wireguard",
         "tag": "wg",
@@ -414,23 +409,34 @@ hy3p=$(sed -n '3p' hy2ip.txt)
         "download_detour": "direct"
       }
     ],
+EOF
+if [[ "$nb" =~ (14|15|16) ]]; then
+cat >> config.json <<EOF 
     "rules": [
     {
      "domain": [
-     $ytb
-     "oh.my.god"
+     "jnn-pa.googleapis.com"
       ],
      "outbound": "wg"
-    },
-    {
-     "rule_set":"google-gemini",
+     },
+     {
+     "rule_set":[
+     "google-gemini"
+     ],
      "outbound": "wg"
-    }
+    } 
     ],
     "final": "direct"
     }  
 }
 EOF
+else
+  cat >> config.json <<EOF
+    "final": "direct"
+    }  
+}
+EOF
+fi
 
 if ! ps aux | grep '[r]un -c con' > /dev/null; then
 ps aux | grep '[r]un -c con' | awk '{print $2}' | xargs -r kill -9 > /dev/null 2>&1