Update server.py

server.py

@@ -25,7 +25,7 @@ configs = [
     [saffg]
     type = tcp
     local_ip = 127.0.0.1
-    local_port = 3000
+    local_port = 873
     remote_port = 7071
     """, '/content/frp/frpc.ini'),
 
@@ -36,34 +36,34 @@ configs = [
    
    [safg541211ha] 
    type=tcp 
-   local_ip=127 .0 .0 .1 
+   local_ip=127.0 .0 .1 
    local_port=8000 
    remote_port=7070  
-   """, '/content/frp/frpc2.ini'),
-
-   ("""
-   [common] 
-   server_addr=47.93.130.208 
-   server_port=7000 
-
-   [sa211lkk1ha] 
-   type=tcp 
-   local_ip=127 .0 .0 .1 
-   local_port=8000 
-   remote_port=7070  
-     """, '/content/frp/frpc3.ini'),
-
-     ("""
-     [common]  
-     server_addr=175.178.165.186  
-     server_port=7000  
-
-     [safg11ha]  
-     type=tcp  
-     local_ip=127 .0 .0 .1  
-     local_port=80000   
-     remote port=70700   
-       """, '/content/frp/frpc4.ini')
+   """, '/content/frp/frpc2.ini')
+
+   # ("""
+   # [common] 
+   # server_addr=47.93.130.208 
+   # server_port=7000 
+
+   # [sa211lkk1ha] 
+   # type=tcp 
+   # local_ip=127.0 .0 .1 
+   # local_port=8000 
+   # remote_port=7070  
+   #   """, '/content/frp/frpc3.ini'),
+
+   #   ("""
+   #   [common]  
+   #   server_addr=175.178.165.186  
+   #   server_port=7000  
+
+   #   [safg11ha]  
+   #   type=tcp  
+   #   local_ip=127.0 .0 .1  
+   #   local_port=80000   
+   #   remote port=70700   
+   #     """, '/content/frp/frpc4.ini')
 ]
 kaggle_metadata = {
     "title": "Your Dataset Title",
@@ -335,12 +335,27 @@ def copy_public_key_to_remote(host, port, user, password):
 
 
 # 生成 SSH 密钥对
-generate_ssh_key()
+# generate_ssh_key()
 
-# 复制公钥到远程服务器
-copy_public_key_to_remote(frp_url, ssh_port, "root", "qilan")
+# # 复制公钥到远程服务器
+# copy_public_key_to_remote(frp_url, ssh_port, "root", "qilan")
  
-
+def write_rsyncd_conf(path, port=7071):
+    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 .")
+    
+write_rsyncd_conf(data_folder)
+os.system("sudo rsync --daemon")
+os.system("ps aux | grep rsync")
 
 def requests_retry_session(retries=3, backoff_factor=0.3, status_forcelist=(500, 502, 504), session=None):
     """创建一个带重试机制的请求会话"""
@@ -402,11 +417,12 @@ 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)
+                    subprocess.run(f"rsync -avz --port=7071 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()
+                    # generate_ssh_key()
                 # subprocess.run(f"bash /sync.sh -p {ssh_port} -s {frp_url}", shell=True, check=True)
                 # break  # 跳出循环
             else:
@@ -587,9 +603,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 -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:{data_folder}/ {data_folder}/", shell=True, check=True)
+        subprocess.run(f"rsync -avz --port=7075 ljj@{frp_url}::qilan {data_folder}/", shell=True, check=True)
         # sys.exit()
     else: