diff --git a/nixos/lib/vargen/main.go b/nixos/lib/vargen/main.go index 66130bb..1bff7e2 100644 --- a/nixos/lib/vargen/main.go +++ b/nixos/lib/vargen/main.go @@ -77,9 +77,9 @@ func main() { iot0 = newSubnet("iot0", 66, gua6, !trusted) server = mgmt0.newHost( - "servnerr-3", - netip.MustParseAddr("192.168.1.6"), - mac("1c:1b:0d:ea:83:0f"), + "servnerr-4", + netip.MustParseAddr("192.168.1.10"), + mac("04:d9:f5:7e:1c:47"), ) desktop = mgmt0.newHost( @@ -105,11 +105,6 @@ func main() { Servers: []host{ server, desktop, - lan0.newHost( - "theatnerr-1", - netip.MustParseAddr("192.168.10.10"), - mac("94:de:80:6c:0e:ef"), - ), mgmt0.newHost( "monitnerr-1", netip.MustParseAddr("192.168.1.8"), @@ -120,10 +115,6 @@ func main() { netip.MustParseAddr("192.168.10.12"), mac("c4:bd:e5:1b:8a:e6"), ), - lab0.newHost("servnerr-3.lab", - netip.MustParseAddr("192.168.2.2"), - mac("72:18:6c:5f:39:fb"), - ), }, Infra: []host{ mgmt0.newHost( @@ -141,13 +132,11 @@ func main() { netip.MustParseAddr("192.168.1.4"), mac("74:ac:b9:e2:4e:a5"), ), - /* mgmt0.newHost( - "ap-livingroom", + "pdu01", netip.MustParseAddr("192.168.1.5"), - mac("d0:4d:c6:c1:75:4c"), + mac("00:0c:15:41:33:5e"), ), - */ // server: 192.168.1.6 // desktop: 192.168.1.7 // monitor: 192.168.1.8 diff --git a/nixos/lib/vars.json b/nixos/lib/vars.json index 2ba32b0..77784f1 100644 --- a/nixos/lib/vars.json +++ b/nixos/lib/vars.json @@ -1,18 +1,18 @@ { - "server_ipv4": "192.168.1.6", - "server_ipv6": "2600:6c4a:787f:1900:1e1b:dff:feea:830f", + "server_ipv4": "192.168.1.10", + "server_ipv6": "2600:6c4a:787f:1900:6d9:f5ff:fe7e:1c47", "desktop_ipv6": "2600:6c4a:787f:1900:7656:3cff:fe43:7337", "hosts": { "servers": [ { - "name": "servnerr-3", - "ipv4": "192.168.1.6", + "name": "servnerr-4", + "ipv4": "192.168.1.10", "ipv6": { - "gua": "2600:6c4a:787f:1900:1e1b:dff:feea:830f", - "ula": "fd9e:1a04:f01d:0:1e1b:dff:feea:830f", - "lla": "fe80::1e1b:dff:feea:830f" + "gua": "2600:6c4a:787f:1900:6d9:f5ff:fe7e:1c47", + "ula": "fd9e:1a04:f01d:0:6d9:f5ff:fe7e:1c47", + "lla": "fe80::6d9:f5ff:fe7e:1c47" }, - "mac": "1c:1b:0d:ea:83:0f" + "mac": "04:d9:f5:7e:1c:47" }, { "name": "nerr-4", @@ -24,16 +24,6 @@ }, "mac": "74:56:3c:43:73:37" }, - { - "name": "theatnerr-1", - "ipv4": "192.168.10.10", - "ipv6": { - "gua": "2600:6c4a:787f:190a:96de:80ff:fe6c:eef", - "ula": "fd9e:1a04:f01d:10:96de:80ff:fe6c:eef", - "lla": "fe80::96de:80ff:fe6c:eef" - }, - "mac": "94:de:80:6c:0e:ef" - }, { "name": "monitnerr-1", "ipv4": "192.168.1.8", @@ -53,16 +43,6 @@ "lla": "fe80::c6bd:e5ff:fe1b:8ae6" }, "mac": "c4:bd:e5:1b:8a:e6" - }, - { - "name": "servnerr-3.lab", - "ipv4": "192.168.2.2", - "ipv6": { - "gua": "2600:6c4a:787f:1902:7018:6cff:fe5f:39fb", - "ula": "fd9e:1a04:f01d:2:7018:6cff:fe5f:39fb", - "lla": "fe80::7018:6cff:fe5f:39fb" - }, - "mac": "72:18:6c:5f:39:fb" } ], "infra": [ @@ -96,6 +76,16 @@ }, "mac": "74:ac:b9:e2:4e:a5" }, + { + "name": "pdu01", + "ipv4": "192.168.1.5", + "ipv6": { + "gua": "2600:6c4a:787f:1900:20c:15ff:fe41:335e", + "ula": "fd9e:1a04:f01d:0:20c:15ff:fe41:335e", + "lla": "fe80::20c:15ff:fe41:335e" + }, + "mac": "00:0c:15:41:33:5e" + }, { "name": "keylight", "ipv4": "192.168.66.10", @@ -234,18 +224,7 @@ "ula": "fd9e:1a04:f01d:2::1", "lla": "fe80::1" }, - "hosts": [ - { - "name": "servnerr-3.lab", - "ipv4": "192.168.2.2", - "ipv6": { - "gua": "2600:6c4a:787f:1902:7018:6cff:fe5f:39fb", - "ula": "fd9e:1a04:f01d:2:7018:6cff:fe5f:39fb", - "lla": "fe80::7018:6cff:fe5f:39fb" - }, - "mac": "72:18:6c:5f:39:fb" - } - ] + "hosts": [] }, "lan0": { "name": "lan0", @@ -258,16 +237,6 @@ "lla": "fe80::1" }, "hosts": [ - { - "name": "theatnerr-1", - "ipv4": "192.168.10.10", - "ipv6": { - "gua": "2600:6c4a:787f:190a:96de:80ff:fe6c:eef", - "ula": "fd9e:1a04:f01d:10:96de:80ff:fe6c:eef", - "lla": "fe80::96de:80ff:fe6c:eef" - }, - "mac": "94:de:80:6c:0e:ef" - }, { "name": "matt-3", "ipv4": "192.168.10.12", @@ -292,14 +261,14 @@ }, "hosts": [ { - "name": "servnerr-3", - "ipv4": "192.168.1.6", + "name": "servnerr-4", + "ipv4": "192.168.1.10", "ipv6": { - "gua": "2600:6c4a:787f:1900:1e1b:dff:feea:830f", - "ula": "fd9e:1a04:f01d:0:1e1b:dff:feea:830f", - "lla": "fe80::1e1b:dff:feea:830f" + "gua": "2600:6c4a:787f:1900:6d9:f5ff:fe7e:1c47", + "ula": "fd9e:1a04:f01d:0:6d9:f5ff:fe7e:1c47", + "lla": "fe80::6d9:f5ff:fe7e:1c47" }, - "mac": "1c:1b:0d:ea:83:0f" + "mac": "04:d9:f5:7e:1c:47" }, { "name": "nerr-4", @@ -350,6 +319,16 @@ "lla": "fe80::76ac:b9ff:fee2:4ea5" }, "mac": "74:ac:b9:e2:4e:a5" + }, + { + "name": "pdu01", + "ipv4": "192.168.1.5", + "ipv6": { + "gua": "2600:6c4a:787f:1900:20c:15ff:fe41:335e", + "ula": "fd9e:1a04:f01d:0:20c:15ff:fe41:335e", + "lla": "fe80::20c:15ff:fe41:335e" + }, + "mac": "00:0c:15:41:33:5e" } ] }, diff --git a/nixos/routnerr-2/configuration.nix b/nixos/routnerr-2/configuration.nix index 94a1dcc..6fd822f 100644 --- a/nixos/routnerr-2/configuration.nix +++ b/nixos/routnerr-2/configuration.nix @@ -81,10 +81,10 @@ in { nix = { distributedBuilds = true; buildMachines = [{ - hostName = "servnerr-3"; + hostName = "servnerr-4"; system = "x86_64-linux"; - maxJobs = 8; - speedFactor = 2; + maxJobs = 16; + speedFactor = 4; supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; }]; }; diff --git a/nixos/routnerr-2/traefik.nix b/nixos/routnerr-2/traefik.nix index f72a8e0..9b62eb3 100644 --- a/nixos/routnerr-2/traefik.nix +++ b/nixos/routnerr-2/traefik.nix @@ -72,15 +72,15 @@ in { services = { alertmanager.loadBalancer.servers = - [{ url = "http://servnerr-3.${vars.domain}:9093"; }]; + [{ url = "http://servnerr-4.${vars.domain}:9093"; }]; grafana.loadBalancer.servers = - [{ url = "http://servnerr-3.${vars.domain}:3000"; }]; + [{ url = "http://servnerr-4.${vars.domain}:3000"; }]; hass.loadBalancer.servers = - [{ url = "http://servnerr-3.${vars.domain}:8123"; }]; + [{ url = "http://servnerr-4.${vars.domain}:8123"; }]; plex.loadBalancer.servers = - [{ url = "http://servnerr-3.${vars.domain}:32400"; }]; + [{ url = "http://servnerr-4.${vars.domain}:32400"; }]; prometheus.loadBalancer.servers = - [{ url = "http://servnerr-3.${vars.domain}:9090"; }]; + [{ url = "http://servnerr-4.${vars.domain}:9090"; }]; }; }; };