+7 -14

globals.nix

··· 38 38 hbt-banana = "banana.${hypixel-bank-tracker}"; 39 39 }; 40 40 41 41 - network = 42 42 - let 43 43 - pipeNoMask = [ 44 44 - llib.net.decompose 45 45 - (addr: addr.addressNoMask) 46 46 - ]; 47 47 - in 48 48 - rec { 49 49 - primary4 = llib.net.decompose "91.99.55.74"; 50 50 - primary6-subnet = llib.net.decompose "2a01:4f8:c2c:76d2::/64"; 41 41 + network = rec { 42 42 + primary4 = llib.net.decompose "91.99.55.74"; 43 43 + primary6-subnet = llib.net.decompose "2a01:4f8:c2c:76d2::/64"; 51 44 52 52 - weird-row-server = lib.pipe primary4.address pipeNoMask; 53 53 - weird-row-server6 = lib.pipe (llib.net.assignAddress primary6-subnet.address 1) pipeNoMask; 54 54 - weird-row-server6-agnos = lib.pipe (llib.net.assignAddress primary6-subnet.address 2) pipeNoMask; 55 55 - }; 45 45 + weird-row-server-v4 = primary4; 46 46 + weird-row-server-v6 = llib.net.decompose (llib.net.assignAddress primary6-subnet.address 1); 47 47 + weird-row-server-v6-agnos = llib.net.decompose (llib.net.assignAddress primary6-subnet.address 2); 48 48 + }; 56 49 }

+1 -1

hosts/weird-row-server/agnos.nix

··· 20 20 enable = true; 21 21 temporarilyOpenFirewall = true; 22 22 settings = { 23 23 - dns_listen_addr = "[${globals.hosts.weird-row-server.ip6-agnos}]:53"; 23 23 + dns_listen_addr = "[${globals.network.weird-row-server-v6-agnos.addressNoMask}]:53"; 24 24 25 25 accounts = [ 26 26 {

+3 -3

hosts/weird-row-server/default.nix

··· 60 60 systemd.network.networks."40-eth0" = { 61 61 matchConfig.Name = "eth0"; 62 62 address = [ 63 63 - "${globals.hosts.weird-row-server.ip}/${toString globals.hosts.weird-row-server.ip-prefix-length}" 64 64 - "${globals.hosts.weird-row-server.ip6}/${toString globals.hosts.weird-row-server.ip6-prefix-length}" 65 65 - "${globals.hosts.weird-row-server.ip6-agnos}/${toString globals.hosts.weird-row-server.ip6-prefix-length}" 63 63 + globals.network.weird-row-server-v4.address 64 64 + globals.network.weird-row-server-v6.address 65 65 + globals.network.weird-row-server-v6-agnos.address 66 66 ]; 67 67 routes = [ 68 68 {

+1 -1

lib/flake/default.nix

··· 22 22 inherit self; 23 23 # local flake library 24 24 llib = import ../. pkgs; 25 25 - globals = import ../../globals.nix; 25 25 + globals = import ../../globals.nix pkgs; 26 26 # local packages set 27 27 lpkgs = import ../../pkgs pkgs; 28 28 # unstable nixpkgs set

+5 -5

terraform/dns.tf

··· 12 12 name = "weird-row.portal" 13 13 type = "A" 14 14 records = [ 15 15 - { value = local.network.weird-row-server }, 15 15 + { value = local.network.weird-row-server-v4 }, 16 16 ] 17 17 labels = { 18 18 portal = "", ··· 23 23 name = "weird-row.portal" 24 24 type = "AAAA" 25 25 records = [ 26 26 - { value = local.network.weird-row-server6 }, 26 26 + { value = local.network.weird-row-server-v6 }, 27 27 ] 28 28 labels = { 29 29 portal = "", ··· 37 37 name = "@" 38 38 type = "A" 39 39 records = [ 40 40 - { value = local.network.weird-row-server }, 40 40 + { value = local.network.weird-row-server-v4 }, 41 41 ] 42 42 } 43 43 resource "hcloud_zone_rrset" "wiro_world-tl-aaaa" { ··· 45 45 name = "@" 46 46 type = "AAAA" 47 47 records = [ 48 48 - { value = local.network.weird-row-server6 }, 48 48 + { value = local.network.weird-row-server-v6 }, 49 49 ] 50 50 } 51 51 ··· 163 163 name = "agnos.weird-row.portal" 164 164 type = "AAAA" 165 165 records = [ 166 166 - { value = local.network.weird-row-server6-agnos }, 166 166 + { value = local.network.weird-row-server-v6-agnos }, 167 167 ] 168 168 labels = { 169 169 agnos = "",

+3 -3

terraform/main.tf

··· 37 37 38 38 locals { 39 39 network = { 40 40 - weird-row-server = hcloud_primary_ip.primary-v4.ip_address 41 41 - weird-row-server6 = cidrhost(hcloud_primary_ip.primary-v6.ip_network, 1) 42 42 - weird-row-server6-agnos = cidrhost(hcloud_primary_ip.primary-v6.ip_network, 2) 40 40 + weird-row-server-v4 = hcloud_primary_ip.primary-v4.ip_address 41 41 + weird-row-server-v6 = cidrhost(hcloud_primary_ip.primary-v6.ip_network, 1) 42 42 + weird-row-server-v6-agnos = cidrhost(hcloud_primary_ip.primary-v6.ip_network, 2) 43 43 } 44 44 } 45 45