From ae96cb97d241ad1f579e924e1351993d30528397 Mon Sep 17 00:00:00 2001 From: chn Date: Sat, 22 Mar 2025 10:21:02 +0800 Subject: [PATCH] migrate vps6 --- devices/cross/wireguard.nix | 2 +- devices/pc/default.nix | 4 ++-- modules/packages/ssh.nix | 4 ++-- modules/services/xray.nix | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devices/cross/wireguard.nix b/devices/cross/wireguard.nix index d4e35124..b9f12947 100644 --- a/devices/cross/wireguard.nix +++ b/devices/cross/wireguard.nix @@ -7,7 +7,7 @@ let peers = [ "pc" "nas" "one" "vps7" "srv2-node0" "srv1-node0" "vps8" ]; publicKey = "AVOsYUKQQCvo3ctst3vNi8XSVWo1Wh15066aHh+KpF4="; wireguardIp = 1; - listenIp = "74.211.99.69"; + listenIp = "144.34.225.59"; lighthouse = true; }; vps7 = diff --git a/devices/pc/default.nix b/devices/pc/default.nix index 7e4871b2..4f992cf5 100644 --- a/devices/pc/default.nix +++ b/devices/pc/default.nix @@ -82,7 +82,7 @@ inputs: dnsmasq.hosts = builtins.listToAttrs ( (builtins.map - (name: { inherit name; value = "74.211.99.69"; }) + (name: { inherit name; value = "144.34.225.59"; }) [ "mirism.one" "beta.mirism.one" "ng01.mirism.one" "initrd.vps6.chn.moe" ]) ++ (builtins.map (name: { inherit name; value = "0.0.0.0"; }) @@ -164,7 +164,7 @@ inputs: services.udev.extraRules = ''ACTION=="add", ATTR{power/wakeup}="disabled"''; # 允许kvm读取物理硬盘 users.users.qemu-libvirtd.extraGroups = [ "disk" ]; - networking.extraHosts = "74.211.99.69 mirism.one beta.mirism.one ng01.mirism.one"; + networking.extraHosts = "144.34.225.59 mirism.one beta.mirism.one ng01.mirism.one"; services.colord.enable = true; }; } diff --git a/modules/packages/ssh.nix b/modules/packages/ssh.nix index 724605bf..ad92a828 100644 --- a/modules/packages/ssh.nix +++ b/modules/packages/ssh.nix @@ -10,12 +10,12 @@ inputs: vps6 = { ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIO5ZcvyRyOnUCuRtqrM/Qf+AdUe3a5bhbnfyhw2FSLDZ"; - hostnames = [ "vps6.chn.moe" "wireguard.vps6.chn.moe" "74.211.99.69" "192.168.83.1" ]; + hostnames = [ "vps6.chn.moe" "wireguard.vps6.chn.moe" "144.34.225.59" "192.168.83.1" ]; }; "initrd.vps6" = { ed25519 = "AAAAC3NzaC1lZDI1NTE5AAAAIB4DKB/zzUYco5ap6k9+UxeO04LL12eGvkmQstnYxgnS"; - hostnames = [ "initrd.vps6.chn.moe" "74.211.99.69" ]; + hostnames = [ "initrd.vps6.chn.moe" "144.34.225.59" ]; }; vps7 = { diff --git a/modules/services/xray.nix b/modules/services/xray.nix index 49b690a9..3bd253a5 100644 --- a/modules/services/xray.nix +++ b/modules/services/xray.nix @@ -7,7 +7,7 @@ inputs: enable = mkOption { type = types.bool; default = false; }; xray = { - serverAddress = mkOption { type = types.nonEmptyStr; default = "74.211.99.69"; }; + serverAddress = mkOption { type = types.nonEmptyStr; default = "144.34.225.59"; }; serverName = mkOption { type = types.nonEmptyStr; default = "vps6.xserver.chn.moe"; }; }; dnsmasq =