hosts(bwg-lax): replace v-ps-sjc

xddxdd · Nov 4, 2024 · 4af8ec5 · 4af8ec5
1 parent 0fb8b8e
commit 4af8ec5
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 49 deletions.
diff --git a/dns/common/default.nix b/dns/common/default.nix
@@ -22,7 +22,7 @@
 
   config.common = rec {
     inherit (LT) hosts;
-    fallbackServer = LT.hosts.v-ps-sjc;
+    fallbackServer = LT.hosts.bwg-lax;
 
     apexRecords =
       _domain:

diff --git a/dns/common/host-recs.nix b/dns/common/host-recs.nix
@@ -12,10 +12,11 @@ let
   replacedHosts = {
     "50kvm" = LT.hosts."v-ps-hkg";
     gigsgigscloud = LT.hosts."v-ps-hkg";
+    hostdare = LT.hosts."bwg-lax";
     linkin = LT.hosts."v-ps-hkg";
-    hostdare = LT.hosts."v-ps-sjc";
     oneprovider = LT.hosts."hetzner-de";
     soyoustart = LT.hosts."hetzner-de";
+    v-ps-sjc = LT.hosts."bwg-lax";
     virmach-ny3ip = LT.hosts."virmach-ny6g";
     virtono = LT.hosts."buyvm";
   };

diff --git a/dns/common/nameservers.nix b/dns/common/nameservers.nix
@@ -2,15 +2,15 @@ _:
 let
   PublicServers = [
     "v-ps-hkg.lantian.pub."
-    "v-ps-sjc.lantian.pub."
+    "bwg-lax.lantian.pub."
     "virmach-ny1g.lantian.pub."
     "hetzner-de.lantian.pub."
     "buyvm.lantian.pub."
   ];
 
   LTNetServers = [
     "v-ps-hkg.ltnet.lantian.pub."
-    "v-ps-sjc.ltnet.lantian.pub."
+    "bwg-lax.ltnet.lantian.pub."
     "virmach-ny1g.ltnet.lantian.pub."
     "hetzner-de.ltnet.lantian.pub."
     "buyvm.ltnet.lantian.pub."

diff --git a/dns/domains/lantian.dn42.nix b/dns/domains/lantian.dn42.nix
@@ -18,7 +18,7 @@
         })
         (config.common.hostRecs.mapAddresses {
           name = "ns2.${domain}.";
-          addresses = LT.hosts."v-ps-sjc".dn42;
+          addresses = LT.hosts."bwg-lax".dn42;
         })
         (config.common.hostRecs.mapAddresses {
           name = "ns3.${domain}.";

diff --git a/dns/domains/lantian.neo.nix b/dns/domains/lantian.neo.nix
@@ -18,7 +18,7 @@
         })
         (config.common.hostRecs.mapAddresses {
           name = "ns2.${domain}.";
-          addresses = LT.hosts."v-ps-sjc".neonetwork;
+          addresses = LT.hosts."bwg-lax".neonetwork;
         })
         (config.common.hostRecs.mapAddresses {
           name = "ns3.${domain}.";

diff --git a/flake.lock b/flake.lock
diff --git a/hosts/bwg-lax/configuration.nix b/hosts/bwg-lax/configuration.nix
@@ -0,0 +1,49 @@
+{ LT, ... }:
+{
+  imports = [
+    ../../nixos/server.nix
+
+    ./dn42.nix
+    ./hardware-configuration.nix
+  ];
+
+  systemd.network.networks.eth0 = {
+    address = [ "64.64.231.82/22" ];
+    gateway = [ "64.64.228.1" ];
+    matchConfig.Name = "eth0";
+    networkConfig.Tunnel = "henet";
+  };
+
+  systemd.network.networks.dummy0.address = [ "fdbc:f9dc:67ad::dd:c85a:8a93/128" ];
+
+  systemd.network.netdevs.henet = {
+    netdevConfig = {
+      Kind = "sit";
+      Name = "henet";
+    };
+    tunnelConfig = {
+      Local = LT.this.public.IPv4;
+      Remote = "72.52.104.74";
+      TTL = 255;
+    };
+  };
+
+  systemd.network.networks.henet = {
+    address = [
+      "2001:470:1f04:159::2/64"
+      "2001:470:1f05:159::1/64"
+      "2001:470:805e::1/48"
+    ];
+    gateway = [ "2001:470:1f04:159::1" ];
+    matchConfig.Name = "henet";
+  };
+
+  services."route-chain" = {
+    enable = true;
+    routes = [
+      "172.22.76.97/29"
+      "2001:470:1f05:159::1/120"
+      "2001:470:805e::1/120"
+    ];
+  };
+}
diff --git a/hosts/v-ps-sjc/dn42.nix → hosts/bwg-lax/dn42.nix b/hosts/v-ps-sjc/dn42.nix → hosts/bwg-lax/dn42.nix
diff --git a/hosts/v-ps-sjc/hardware-configuration.nix → hosts/bwg-lax/hardware-configuration.nix b/hosts/v-ps-sjc/hardware-configuration.nix → hosts/bwg-lax/hardware-configuration.nix
@@ -13,7 +13,7 @@ _: {
   ];
 
   fileSystems."/nix" = {
-    device = "/dev/vda1";
+    device = "/dev/sda1";
     fsType = "btrfs";
     options = [
       "compress-force=zstd"
@@ -28,10 +28,10 @@ _: {
     options = [ "bind" ];
   };
 
-  swapDevices = [
-    {
-      device = "/dev/vda2";
-      randomEncryption.enable = true;
-    }
-  ];
+  # swapDevices = [
+  #   {
+  #     device = "/dev/sda2";
+  #     randomEncryption.enable = true;
+  #   }
+  # ];
 }
diff --git a/hosts/v-ps-sjc/host.nix → hosts/bwg-lax/host.nix b/hosts/v-ps-sjc/host.nix → hosts/bwg-lax/host.nix
@@ -6,15 +6,17 @@
     public-facing
     qemu
     server
+    x86_64-v1
   ];
-  city = geo.cities."US San Jose";
+  city = geo.cities."US Los Angeles";
+  hostname = "64.64.231.82";
   ssh = {
     rsa = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC4aYURWnQGEkxYueAnGgZQbrQA+SHNLRgpJZd+2J9DyKdtoqXRhSjGEAGJkqBg8alWadaYJ15wvKj5BHoTQCao6XXzuxsP35Y+xtaWJ0wJ5ZJ3/J8l4z0V/85EdYqxPInQe0cpfqTEt+lnqlOOeq4f9522OMErSzefAk/MHp+OxDWr2ZdrZVggGVFpujFdCU3ckM8NMCZUufOXX2+wXQfkMXd3umGaM3oMJl6bIEyqtLwlCWnSuMEXS5JwnZ3lhKg73PO5tRaq2FcL8RXaph9uiHWmP/ch2RTnJ4xjmbhiGQuaebtCUnfW6sDZPfOv5KOx5T4V8yBOtnyDPoS2mYKva1I9HztW4JgzWzTRonFqbaH61jFalyWPTPMt/W1gQWZEnWbCewt+jBGUApBTaxDnKXywGxyjpb7MOfdLAuDkr19p9PR04G5BOw940CXeU3K0KvLjwsQN3ptHL4t6GesNWcZ3x8cxZbvi3n58GUgGjjxTro+TXgzqPU9U7JYeFPwdgoytBSPucA4DheYCkV6/V30tX8UETpGuSzWUplyVCbbXbZYGh6ulce3X4xXn0Nir3F4bzTCQlvzTWz8zkmHW1QERmStVhMJD2K7JWpe0h97zzi+jFv9QLLnfBBKjia02s7if3sZTjk4jI59B3X9Fmf3faeNXIoDMRBJcIwFtyw==";
     ed25519 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH7jqK5IsCqMJqJUhAk2oQBQHhvxEb2q39BKNi1VsyOg";
   };
   public = {
-    IPv4 = "80.66.196.80";
-    IPv6 = "2604:a840:2::ed";
+    IPv4 = "64.64.231.82";
+    IPv6 = "2001:470:1f05:159::1";
   };
   dn42 = {
     IPv4 = "172.22.76.185";

diff --git a/hosts/v-ps-sjc/configuration.nix b/hosts/v-ps-sjc/configuration.nix
diff --git a/nixos/client-apps/v2ray.nix b/nixos/client-apps/v2ray.nix
@@ -43,7 +43,7 @@ let
         protocol = "trojan";
         settings.servers = [
           {
-            address = LT.hosts."v-ps-sjc".public.IPv4;
+            address = LT.hosts."bwg-lax".public.IPv4;
             port = 443;
             password = {
               _secret = config.age.secrets.v2ray-key.path;

diff --git a/nixos/optional-apps/bird-lg-go.nix b/nixos/optional-apps/bird-lg-go.nix
@@ -4,7 +4,7 @@ let
     "buyvm"
     "oracle-vm1"
     "v-ps-hkg"
-    "v-ps-sjc"
+    "bwg-lax"
     "virmach-ny1g"
   ];
   lgproxyDomain = "bird-lg-go";