From 2dc53c0c381986ee71fa81793d86c208e689877a Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Sun, 16 Nov 2025 11:20:01 +0800
Subject: [PATCH] devices.srv1/srv2: use vps9 to proxy

---
 devices/cross/tinc.nix   | 6 +++---
 devices/srv1/default.nix | 2 +-
 devices/srv2/default.nix | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/devices/cross/tinc.nix b/devices/cross/tinc.nix
index 8d68c9c8..d896415a 100644
--- a/devices/cross/tinc.nix
+++ b/devices/cross/tinc.nix
@@ -23,12 +23,12 @@ let
     # vps
     { device = inputs.lib.genAttrs [ "vps4" "vps6" "vps9" ] getAddress; distance = 1; }
     # 使用 vps9 代理的机器
-    { device = { vps9 = getAddress "vps9"; nas = null; }; distance = 10; }
-    # 使用 vps6 代理的机器
     {
-      device = (inputs.lib.genAttrs [ "pc" "srv1-node0" "srv2-node0" ] (_: null)) // { vps6 = getAddress "vps6"; };
+      device = (inputs.lib.genAttrs [ "srv1-node0" "srv2-node0" ] (_: null)) // { vps6 = getAddress "vps6"; };
       distance = 10;
     }
+    # 使用 vps6 代理的机器
+    { device = { vps6 = getAddress "vps6"; pc = null; }; distance = 10; }
     # 校内网络
     { device = (inputs.lib.genAttrs [ "srv1-node0" "srv2-node0" ] getAddress) // { nas = null; }; distance = 1; }
     # srv1 内部网络
diff --git a/devices/srv1/default.nix b/devices/srv1/default.nix
index 095a9329..b78167ed 100644
--- a/devices/srv1/default.nix
+++ b/devices/srv1/default.nix
@@ -60,7 +60,7 @@ inputs:
           ];
         };
         mariadb.mountFrom = "nodatacow";
-        xray.client = {};
+        xray.client.xray.serverName = "xserver2.vps9.chn.moe";
       };
       packages.vasp = {};
       user.users = [ "chn" "xll" "zem" "yjq" "gb" "wp" "hjp" "wm" "GROUPIII-1" "GROUPIII-2" "GROUPIII-3" "zgq" ];
diff --git a/devices/srv2/default.nix b/devices/srv2/default.nix
index 39d18f22..632cfccf 100644
--- a/devices/srv2/default.nix
+++ b/devices/srv2/default.nix
@@ -85,7 +85,7 @@ inputs:
           };
           timeLimit = "48:00:00";
         };
-        xray.client = {};
+        xray.client.xray.serverName = "xserver2.vps9.chn.moe";
       };
       packages = { vasp = {}; desktop = {}; lumerical = {}; };
       user.users =