mirrors/mdlayher-homelab
1
0
Fork 0
mirror of https://github.com/mdlayher/homelab.git synced 2024-12-14 11:47:32 +00:00
Code Activity

nixos/lib: renumber tengb0 to VLAN 110 format

Browse source 
Signed-off-by: Matt Layher <mdlayher@gmail.com>
This commit is contained in:
Matt Layher 2020-06-22 22:15:44 -04:00
parent d93398076f
commit 42c5244477
No known key found for this signature in database
GPG key ID: 77BFE531397EDE94
3 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nixos/lib/vargen/main.go
View file

@ -34,22 +34,23 @@ func main() {
},
}
lan0 = newSubnet("lan0", 10)
iot0 = newSubnet("iot0", 66)
tengb0 = newSubnet("tengb0", 100)
lan0 = newSubnet("lan0", 10)
iot0 = newSubnet("iot0", 66)
// TODO: eventually fix the switch VLAN as well.
tengb0 = newSubnet("tengb0", 110)
wg0 = newSubnet("wg0", 20)
server = newHost(
"servnerr-3",
tengb0,
ip("192.168.100.5"),
ip("192.168.110.5"),
mac("90:e2:ba:5b:99:80"),
)
desktop = newHost(
"nerr-3",
tengb0,
ip("192.168.100.6"),
ip("192.168.110.6"),
mac("90:e2:ba:23:1a:3a"),
)
)

24
nixos/lib/vars.json
View file

@ -1,25 +1,25 @@
{
"server_ipv4": "192.168.100.5",
"server_ipv6": "2600:6c4a:7880:3264:92e2:baff:fe5b:9980",
"desktop_ipv6": "2600:6c4a:7880:3264:92e2:baff:fe23:1a3a",
"server_ipv4": "192.168.110.5",
"server_ipv6": "2600:6c4a:7880:326e:92e2:baff:fe5b:9980",
"desktop_ipv6": "2600:6c4a:7880:326e:92e2:baff:fe23:1a3a",
"hosts": {
"servers": [
{
"name": "servnerr-3",
"ipv4": "192.168.100.5",
"ipv4": "192.168.110.5",
"ipv6": {
"gua": "2600:6c4a:7880:3264:92e2:baff:fe5b:9980",
"ula": "fd9e:1a04:f01d:100:92e2:baff:fe5b:9980",
"gua": "2600:6c4a:7880:326e:92e2:baff:fe5b:9980",
"ula": "fd9e:1a04:f01d:110:92e2:baff:fe5b:9980",
"lla": "fe80::92e2:baff:fe5b:9980"
},
"mac": "90:e2:ba:5b:99:80"
},
{
"name": "nerr-3",
"ipv4": "192.168.100.6",
"ipv4": "192.168.110.6",
"ipv6": {
"gua": "2600:6c4a:7880:3264:92e2:baff:fe23:1a3a",
"ula": "fd9e:1a04:f01d:100:92e2:baff:fe23:1a3a",
"gua": "2600:6c4a:7880:326e:92e2:baff:fe23:1a3a",
"ula": "fd9e:1a04:f01d:110:92e2:baff:fe23:1a3a",
"lla": "fe80::92e2:baff:fe23:1a3a"
},
"mac": "90:e2:ba:23:1a:3a"
@ -162,10 +162,10 @@
"tengb0": {
"name": "tengb0",
"internal_domain": true,
"ipv4": "192.168.100.1",
"ipv4": "192.168.110.1",
"ipv6": {
"gua": "2600:6c4a:7880:3264::1",
"ula": "fd9e:1a04:f01d:100::1",
"gua": "2600:6c4a:7880:326e::1",
"ula": "fd9e:1a04:f01d:110::1",
"lla": "fe80::1"
}
},

2
nixos/routnerr-2/networking.nix
View file

@ -44,7 +44,7 @@ in {
ipv6rs
# DHCPv6-PD.
ia_na 0
ia_pd 1/::/56 ${enp2s0.name}/0/64 ${lab0.name}/2/64 ${guest0.name}/9/64 ${lan0.name}/10/64 ${corp0.name}/30/64 ${iot0.name}/66/64 ${tengb0.name}/100/64
ia_pd 1/::/56 ${enp2s0.name}/0/64 ${lab0.name}/2/64 ${guest0.name}/9/64 ${lan0.name}/10/64 ${corp0.name}/30/64 ${iot0.name}/66/64 ${tengb0.name}/110/64
# IPv4 DHCP ISP settings overrides.
static domain_name_servers=${vars.localhost.ipv4}