Update server2.py

server2.py

@@ -24,7 +24,7 @@ configs = [
     [kjashdsh0144]
     type = tcp
     local_ip = 127.0.0.1
-    local_port = 8000
+    local_port = 873
     remote_port = 7073
     """, '/content/frp/frpc2.ini'),
 
@@ -325,10 +325,10 @@ def copy_public_key_to_remote(host, port, user, password):
 
 
 # 生成 SSH 密钥对
-generate_ssh_key()
-os.system('chmod 600 ~/.ssh/id_rsa')
+# generate_ssh_key()
+# os.system('chmod 600 ~/.ssh/id_rsa')
 # 复制公钥到远程服务器
-copy_public_key_to_remote(frp_url, ssh_port, "root", "qilan")
+# copy_public_key_to_remote(frp_url, ssh_port, "root", "qilan")
  
 
 
@@ -341,6 +341,22 @@ def requests_retry_session(retries=3, backoff_factor=0.3, status_forcelist=(500,
     session.mount('https://', adapter)
     return session
 
+def write_rsyncd_conf(path, port=7073):
+    rsyncd_conf_content = f"""
+port = {port}
+
+[qilan]
+    path = {path}
+    comment = My rsync module
+    read only = no
+    list = yes
+"""
+    with open('/etc/rsyncd.conf', 'w') as f:
+        f.write(rsyncd_conf_content.strip())
+    print(f"Successfully wrote to /etc/rsyncd.conf for module '{module_name}'.")
+    os.system("rsync --daemon")
+write_rsyncd_conf(data_folder)
+
 def check_api1():
     # 第一次检查 SillyTavern 是否启动
     thread_started = False  # 在函数内初始化标志变量
@@ -392,12 +408,13 @@ def check_api1():
                 print("检测到 token")
                 nn = 0
                 try:
-                    subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
+                    # rsync -avz --port=7073 ljj@8.137.94.137::qilan /a/
+                    subprocess.run(f"rsync -avz --port=7073 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
+                    # subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
                 except subprocess.CalledProcessError as e:
                     print(f"Rsync 失败，返回码: {e.returncode}")
                     print(f"Command output: {e.output}")
-                    generate_ssh_key()
-                # subprocess.run(f"bash /sync.sh -p {ssh_port} -s {frp_url}", shell=True, check=True)
+                    # generate_ssh_key()
                 # break  # 跳出循环
             else:
                 print("接口返回信息：", response_json)
@@ -573,9 +590,10 @@ 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(frp_url, ssh_port, "root", "qilan")
-        subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
+        # generate_ssh_key()
+        # copy_public_key_to_remote(frp_url, ssh_port, "root", "qilan")
+        subprocess.run(f"rsync -avz --port=7073 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
+        # subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
         # sys.exit()
     else: