Update server9-bf.py

server9-bf.py

@@ -1,4 +1,7 @@
 ini_content = {"username":"natclghpe","key":"21e32070151c7fe0fbd5af3287d7e489"}
+cf_token = 'eyJhIjoiNmVjNWE5NzEzOGIzMTg4YTU2Y2U1NjdmMWRhZDBhMTUiLCJ0IjoiNjMyNTRkZjYtNWY0ZC00YjM2LTlmZjMtY2M1MzMxMzQ1ODUyIiwicyI6IlpXSTFNV1JsTkRndFlqWmhZUzAwWW1VNUxUZzFOemN0Wm1GbE1tUTFNREZrTldSaiJ9'
+cf_jg = 'https://jg9-cf.qilan.sbs'
+cf_ssh = 'jg9-ssh.qilan.sbs'
 frp_url = '119.8.118.149'
 ssh_port = '7082'
 ssh_url = '45.32.68.209'
@@ -126,6 +129,38 @@ os.system("mkdir -p /content/frp")
 os.system("wget /content/frp/frpc https://huggingface.co/Qilan2/box/resolve/main/frp/frpc -O /content/frp/frpc")
 os.system("chmod +x /content/frp/frpc")
 import yaml
+def cloudflared(zt):
+    if zt:
+        os.system("sudo mkdir -p --mode=0755 /usr/share/keyrings")
+        os.system("curl -fsSL https://pkg.cloudflare.com/cloudflare-public-v2.gpg | sudo tee /usr/share/keyrings/cloudflare-public-v2.gpg >/dev/null")
+        os.system("echo 'deb [signed-by=/usr/share/keyrings/cloudflare-public-v2.gpg] https://pkg.cloudflare.com/cloudflared any main' | sudo tee /etc/apt/sources.list.d/cloudflared.list")
+        os.system("sudo apt-get update && sudo apt-get install cloudflared")
+        
+        # 1. 创建 ~/.ssh 目录
+        ssh_dir = os.path.expanduser("~/.ssh")
+        os.makedirs(ssh_dir, exist_ok=True)
+        
+        # 2. 准备配置文件的内容 (注意这里用 f""" """ 将变量 cf_ssh 注入进去)
+        # SSH 原本的 %h 会被原样保留，不会和 Python 的 f-string 冲突
+        ssh_config_content = f"""Host {cf_ssh}
+    ProxyCommand cloudflared access ssh --hostname %h
+    StrictHostKeyChecking no
+"""
+        
+        # 3. 写入内容到 ~/.ssh/config
+        config_path = os.path.join(ssh_dir, "config")
+        with open(config_path, "w") as f:
+            f.write(ssh_config_content)
+        
+        # 4. 修改文件权限
+        os.chmod(config_path, 0o600)
+        
+        # 打印日志也动态显示域名
+        print(f"✅ SSH config for {cf_ssh} generated successfully.")
+        
+    else:  
+        os.system(f"sudo cloudflared service install {cf_token}")
+cloudflared(True)
 def nezha():
     agent_config ={
     'client_secret': 'MLcD6YnifhoY08B9n129UP5cg2139NYa',
@@ -186,6 +221,7 @@ def update():
     # 安装 p7zip-full
     os.system("pip uninstall requests urllib3 -y")
     os.system("pip install requests urllib3")
+    os.system("apt-get install -y sshpass")
     os.system("sudo apt install p7zip-full -y")
     # os.system("pip install -U kaggle")
     # os.system("pip uninstall -y kaggle > /dev/null 2>&1")    
@@ -378,7 +414,7 @@ def copy_public_key_to_remote(host, port, user, password):
 generate_ssh_key()
 os.system('chmod 600 ~/.ssh/id_rsa')
 # 复制公钥到远程服务器
-copy_public_key_to_remote(ssh_url, ssh_port, "root", "qilan")
+copy_public_key_to_remote(cf_ssh, 22, "root", "qilan")
  
 
 
@@ -458,7 +494,7 @@ def check_api1():
             break
         if nn > 2:
             break
-        url = f"{st_url}/csrf-token"
+        url = f"{cf_jg}/csrf-token"
         try:
             response = requests_retry_session().get(url, timeout=30)
             response.raise_for_status()
@@ -467,7 +503,8 @@ def check_api1():
             if "token" in response_json:
                 print("检测到 token")
                 try:  
-                    subprocess.run(f"rsync -avz --timeout=600 -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/",shell=True, check=True)
+                    # subprocess.run(f"rsync -avz --timeout=600 -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/",shell=True, check=True)
+                    subprocess.run(f"sshpass -p 'qilan' rsync -avz --timeout=600 -e 'ssh -p 22 -o StrictHostKeyChecking=no' root@{cf_ssh}:{data_folder}/ {data_folder}/",shell=True, check=True)
                     # break  # 如果成功，跳出重试循环
                 except subprocess.CalledProcessError as e:
                     nn += 1
@@ -657,8 +694,8 @@ def SillyTavern():
     if not os.path.exists(f'/{huggingface_Data_name}.zip'):
         print(f"文件 /{huggingface_Data_name}.zip 不存在，启用实时同步。")
         generate_ssh_key()
-        copy_public_key_to_remote(ssh_url, ssh_port, "root", "qilan")
-        subprocess.run(f"rsync -avz --timeout=600 -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{ssh_url}:{data_folder}/ {data_folder}/",shell=True, check=True)
+        copy_public_key_to_remote(cf_ssh, 22, "root", "qilan")
+        subprocess.run(f"sshpass -p 'qilan'  rsync -avz --timeout=600 -e 'ssh -p 22 -o StrictHostKeyChecking=no' root@{cf_ssh}:{data_folder}/ {data_folder}/",shell=True, check=True)
     else:
         
         # 如果文件存在，可以继续执行后续代码
@@ -718,6 +755,7 @@ if os.path.exists(f'{data_folder}/start.sh'):
     print("开始衔接")
     Service_status = True
     frp(configs, True)
+    cloudflared(False)
     threading.Thread(target=monitor_port, daemon=True).start()#检测端口状态
     while True:
         if backup_thread.is_alive():