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/routnerr-2: temporarily remove tengb0

Browse source 
Signed-off-by: Matt Layher <mdlayher@gmail.com>
This commit is contained in:
Matt Layher 2021-07-30 11:25:04 -04:00
parent da1c74515a
commit 2b263e3e15
No known key found for this signature in database
GPG key ID: 77BFE531397EDE94
6 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -199,7 +199,9 @@ func main() {
out.addInterface("guest0", guest0)
out.addInterface("iot0", iot0)
out.addInterface("lab0", lab0)
out.addInterface("tengb0", tengb0)
// TODO(mdlayher): re-enable tengb0 when switch is set up.
_ = tengb0
// out.addInterface("tengb0", tengb0)
out.addInterface("wg0", wg0)
// TODO: WANs are special cases and should probably live in their own

11
nixos/lib/vars.json
View file

@ -214,17 +214,6 @@
"lla": "fe80::1"
}
},
"tengb0": {
"name": "tengb0",
"preference": "high",
"internal_dns": true,
"ipv4": "192.168.110.1",
"ipv6": {
"gua": "2600:6c4a:787f:596e::1",
"ula": "fd9e:1a04:f01d:110::1",
"lla": "fe80::1"
}
},
"wan0": {
"name": "enp1s0",
"preference": "medium",

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

@ -28,7 +28,7 @@ in {
})
# Downstream advertising interfaces.
++ lib.forEach [ enp2s0 lab0 lan0 guest0 iot0 tengb0 ] (ifi:
++ lib.forEach [ enp2s0 lab0 lan0 guest0 iot0 ] (ifi:
{
name = ifi.name;
advertise = true;

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

@ -2,7 +2,7 @@
let
vars = import ./lib/vars.nix;
lans = with vars.interfaces; [ enp2s0 lan0 guest0 iot0 lab0 tengb0 ];
lans = with vars.interfaces; [ enp2s0 lan0 guest0 iot0 lab0 ];
in {
services.dhcpd4 = {

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

@ -38,7 +38,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 ${iot0.name}/66/64 ${tengb0.name}/110/64
ia_pd 1/::/56 ${enp2s0.name}/0/64 ${lab0.name}/2/64 ${guest0.name}/9/64 ${lan0.name}/10/64 ${iot0.name}/66/64
# IPv4 DHCP ISP settings overrides.
static domain_name_servers=${vars.localhost.ipv4}
@ -57,7 +57,6 @@ in {
${lab0.name} = mkInterface lab0;
${guest0.name} = mkInterface guest0;
${iot0.name} = mkInterface iot0;
${tengb0.name} = mkInterface tengb0;
};
vlans = with vars.interfaces; {
@ -77,10 +76,6 @@ in {
id = 66;
interface = "${enp2s0.name}";
};
${tengb0.name} = {
id = 100;
interface = "${enp2s0.name}";
};
};
wireguard = with vars.wireguard; {

4
nixos/routnerr-2/nftables.nix
View file

@ -31,8 +31,8 @@ let
all_wans = with vars.interfaces; [ wan0 wwan0 ];
# LAN interfaces, segmented into trusted, limited, and untrusted groups.
metered_lans = with vars.interfaces; [ enp2s0 lan0 tengb0 ];
trusted_lans = with vars.interfaces; [ enp2s0 lan0 lab0 tengb0 wg0 ];
metered_lans = with vars.interfaces; [ enp2s0 lan0 ];
trusted_lans = with vars.interfaces; [ enp2s0 lan0 lab0 wg0 ];
limited_lans = with vars.interfaces; [ guest0 ];
untrusted_lans = with vars.interfaces; [ iot0 ];