diff --git a/devices/cross/tinc.nix b/devices/cross/tinc.nix index 1bde53d2..4e3a8c5a 100644 --- a/devices/cross/tinc.nix +++ b/devices/cross/tinc.nix @@ -22,8 +22,8 @@ let [ # vps { device = inputs.lib.genAttrs [ "vps4" "vps6" "vps9" ] getAddress; distance = 1; } - # 使用 vps4 代理的机器 - { device = { vps4 = getAddress "vps4"; nas = null; }; distance = 10; } + # 使用 vps9 代理的机器 + { device = { vps9 = getAddress "vps9"; nas = null; }; distance = 10; } # 使用 vps6 代理的机器 { device = (inputs.lib.genAttrs [ "pc" "srv1-node0" "srv2-node0" ] (_: null)) // { vps6 = getAddress "vps6"; }; diff --git a/devices/nas/default.nix b/devices/nas/default.nix index a0e15869..296bc9ac 100644 --- a/devices/nas/default.nix +++ b/devices/nas/default.nix @@ -40,7 +40,7 @@ inputs: { client = { - xray.serverName = "xserver2.vps4.chn.moe"; + xray.serverName = "xserver2.vps9.chn.moe"; dnsmasq = { extraInterfaces = [ "enp3s0" ]; hosts."git.chn.moe" = "127.0.0.1"; }; }; xmuServer = {}; diff --git a/devices/vps4/default.nix b/devices/vps4/default.nix index 5b1365b8..59512a09 100644 --- a/devices/vps4/default.nix +++ b/devices/vps4/default.nix @@ -27,12 +27,6 @@ inputs: sshd = {}; fail2ban = {}; xray.server.serverName = "xserver2.vps4.chn.moe"; - nginx.streamProxy.map = builtins.listToAttrs (builtins.map - (site: { name = "${site}.chn.moe"; value.upstream.address = "tinc0.nas.chn.moe"; }) - [ - "xn--s8w913fdga" "matrix" "send" "git" "grafana" "peertube" "rsshub" "misskey" "synapse" "vaultwarden" - "photoprism" "nextcloud" "freshrss" "huginn" "api" "webdav" - ]); }; }; }; diff --git a/devices/vps9/default.nix b/devices/vps9/default.nix index 7fb64c57..ed5c4367 100644 --- a/devices/vps9/default.nix +++ b/devices/vps9/default.nix @@ -27,6 +27,12 @@ inputs: sshd = {}; fail2ban = {}; xray.server.serverName = "xserver2.vps9.chn.moe"; + nginx.streamProxy.map = builtins.listToAttrs (builtins.map + (site: { name = "${site}.chn.moe"; value.upstream.address = "tinc0.nas.chn.moe"; }) + [ + "xn--s8w913fdga" "matrix" "send" "git" "grafana" "peertube" "rsshub" "misskey" "synapse" "vaultwarden" + "photoprism" "nextcloud" "freshrss" "huginn" "api" "webdav" + ]); }; }; }; diff --git a/modules/services/bind.nix b/modules/services/bind.nix index 608d3333..cf26cec6 100644 --- a/modules/services/bind.nix +++ b/modules/services/bind.nix @@ -32,7 +32,7 @@ inputs: 300 ; minimum ) @ IN NS vps6.chn.moe. - @ IN A ${inputs.topInputs.self.config.dns."chn.moe".getAddress "vps4"} + @ IN A ${inputs.topInputs.self.config.dns."chn.moe".getAddress "vps9"} ''; nullZone = inputs.pkgs.writeText "null.zone" ""; in