diff --git a/ci/systems.json b/ci/systems.json index 92c899de..7286cc01 100644 --- a/ci/systems.json +++ b/ci/systems.json @@ -201,7 +201,11 @@ "address6": "fd0a::be24:11ff:fec4:66ab", "macAddress": "BC:24:11:C4:66:AB" }, - "tail": null + "tail": { + "address4": "100.70.124.79", + "address6": "fd7a:115c:a1e0::b001:7c4f", + "macAddress": null + } } } }, @@ -295,6 +299,24 @@ } } }, + "sakuya": { + "network": { + "hostName": "sakuya", + "networks": { + "int": null, + "local": { + "address4": "10.1.1.50", + "address6": "fd0a::2ba:46ff:fef8:4052", + "macAddress": "02:ba:46:f8:40:52" + }, + "tail": { + "address4": "100.71.135.42", + "address6": "fd7a:115c:a1e0::4f01:872a", + "macAddress": null + } + } + } + }, "shanghai": { "network": { "hostName": "shanghai", diff --git a/systems/reisen/systems.json b/systems/reisen/systems.json index 09ef302d..2eae4d05 100644 --- a/systems/reisen/systems.json +++ b/systems/reisen/systems.json @@ -121,7 +121,11 @@ "address6": "fd0a::be24:11ff:fec4:66ab", "macAddress": "BC:24:11:C4:66:AB" }, - "tail": null + "tail": { + "address4": "100.70.124.79", + "address6": "fd7a:115c:a1e0::b001:7c4f", + "macAddress": null + } } } }, diff --git a/systems/sakuya/default.nix b/systems/sakuya/default.nix index e9f8d18f..92ff08f9 100644 --- a/systems/sakuya/default.nix +++ b/systems/sakuya/default.nix @@ -1,8 +1,7 @@ _: { arch = "aarch64"; type = "NixOS"; - ci.allowFailure = true; - access.online.enable = false; + ci.enable = false; modules = [ ./nixos.nix ]; @@ -11,8 +10,8 @@ _: { }; network.networks = { tail = { - #address4 = "100.70.124.79"; - #address6 = "fd7a:115c:a1e0::b001:7c4f"; + address4 = "100.71.135.42"; + address6 = "fd7a:115c:a1e0::4f01:872a"; }; local = { macAddress = "02:ba:46:f8:40:52"; diff --git a/tf/cloudflare_records.tf b/tf/cloudflare_records.tf index 13ef5493..09cb9373 100644 --- a/tf/cloudflare_records.tf +++ b/tf/cloudflare_records.tf @@ -118,6 +118,13 @@ module "kasen_system_records" { ] } +module "sakuya_system_records" { + source = "./system/records" + zone_id = cloudflare_zone.gensokyo-zone_zone.id + zone_zone = cloudflare_zone.gensokyo-zone_zone.zone + net_data = local.systems.kasen.network +} + module "logistics_system_records" { source = "./system/records" zone_id = cloudflare_zone.gensokyo-zone_zone.id