Qilan2 commited on
Commit
f3989e7
·
verified ·
1 Parent(s): 129bfd2

Update server9-bf.py

Browse files
Files changed (1) hide show
  1. server9-bf.py +8 -5
server9-bf.py CHANGED
@@ -1,5 +1,7 @@
1
  ini_content = {"username":"natclghpe","key":"21e32070151c7fe0fbd5af3287d7e489"}
2
  cf_token = 'eyJhIjoiNmVjNWE5NzEzOGIzMTg4YTU2Y2U1NjdmMWRhZDBhMTUiLCJ0IjoiNjMyNTRkZjYtNWY0ZC00YjM2LTlmZjMtY2M1MzMxMzQ1ODUyIiwicyI6IlpXSTFNV1JsTkRndFlqWmhZUzAwWW1VNUxUZzFOemN0Wm1GbE1tUTFNREZrTldSaiJ9'
 
 
3
  frp_url = '119.8.118.149'
4
  ssh_port = '7082'
5
  ssh_url = '45.32.68.209'
@@ -386,7 +388,7 @@ def copy_public_key_to_remote(host, port, user, password):
386
  generate_ssh_key()
387
  os.system('chmod 600 ~/.ssh/id_rsa')
388
  # 复制公钥到远程服务器
389
- copy_public_key_to_remote(ssh_url, ssh_port, "root", "qilan")
390
 
391
 
392
 
@@ -466,7 +468,7 @@ def check_api1():
466
  break
467
  if nn > 2:
468
  break
469
- url = f"{st_url}/csrf-token"
470
  try:
471
  response = requests_retry_session().get(url, timeout=30)
472
  response.raise_for_status()
@@ -475,7 +477,8 @@ def check_api1():
475
  if "token" in response_json:
476
  print("检测到 token")
477
  try:
478
- 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)
 
479
  # break # 如果成功,跳出重试循环
480
  except subprocess.CalledProcessError as e:
481
  nn += 1
@@ -665,8 +668,8 @@ def SillyTavern():
665
  if not os.path.exists(f'/{huggingface_Data_name}.zip'):
666
  print(f"文件 /{huggingface_Data_name}.zip 不存在,启用实时同步。")
667
  generate_ssh_key()
668
- copy_public_key_to_remote(ssh_url, ssh_port, "root", "qilan")
669
- 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)
670
  else:
671
 
672
  # 如果文件存在,可以继续执行后续代码
 
1
  ini_content = {"username":"natclghpe","key":"21e32070151c7fe0fbd5af3287d7e489"}
2
  cf_token = 'eyJhIjoiNmVjNWE5NzEzOGIzMTg4YTU2Y2U1NjdmMWRhZDBhMTUiLCJ0IjoiNjMyNTRkZjYtNWY0ZC00YjM2LTlmZjMtY2M1MzMxMzQ1ODUyIiwicyI6IlpXSTFNV1JsTkRndFlqWmhZUzAwWW1VNUxUZzFOemN0Wm1GbE1tUTFNREZrTldSaiJ9'
3
+ cf_jg = 'https://jg9-cf.qilan.sbs'
4
+ cf_ssh = 'jg9-ssh.qilan.sbs'
5
  frp_url = '119.8.118.149'
6
  ssh_port = '7082'
7
  ssh_url = '45.32.68.209'
 
388
  generate_ssh_key()
389
  os.system('chmod 600 ~/.ssh/id_rsa')
390
  # 复制公钥到远程服务器
391
+ copy_public_key_to_remote(cf_ssh, 22, "root", "qilan")
392
 
393
 
394
 
 
468
  break
469
  if nn > 2:
470
  break
471
+ url = f"{cf_jg}/csrf-token"
472
  try:
473
  response = requests_retry_session().get(url, timeout=30)
474
  response.raise_for_status()
 
477
  if "token" in response_json:
478
  print("检测到 token")
479
  try:
480
+ # 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)
481
+ subprocess.run(f"rsync -avz --timeout=600 -e 'ssh -p 22 -o StrictHostKeyChecking=no' root@{cf_ssh}:{data_folder}/ {data_folder}/",shell=True, check=True)
482
  # break # 如果成功,跳出重试循环
483
  except subprocess.CalledProcessError as e:
484
  nn += 1
 
668
  if not os.path.exists(f'/{huggingface_Data_name}.zip'):
669
  print(f"文件 /{huggingface_Data_name}.zip 不存在,启用实时同步。")
670
  generate_ssh_key()
671
+ copy_public_key_to_remote(cf_ssh, 22, "root", "qilan")
672
+ subprocess.run(f"rsync -avz --timeout=600 -e 'ssh -p 22 -o StrictHostKeyChecking=no' root@{cf_ssh}:{data_folder}/ {data_folder}/",shell=True, check=True)
673
  else:
674
 
675
  # 如果文件存在,可以继续执行后续代码