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: remove corp0 VLAN

Browse source 
Signed-off-by: Matt Layher <mdlayher@gmail.com>
This commit is contained in:
Matt Layher 2020-12-17 09:09:35 -05:00
parent ca0ba79d78
commit 7a86ba4539
No known key found for this signature in database
GPG key ID: 77BFE531397EDE94
6 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -117,7 +117,6 @@ func main() {
// Attach interface definitions from subnet definitions.
out.addInterface("enp2s0", enp2s0)
out.addInterface("corp0", newSubnet("corp0", 30))
out.addInterface("lan0", lan0)
out.addInterface("guest0", newSubnet("guest0", 9))
out.addInterface("iot0", iot0)

10
nixos/lib/vars.json
View file

@ -109,16 +109,6 @@
]
},
"interfaces": {
"corp0": {
"name": "corp0",
"internal_domain": false,
"ipv4": "192.168.30.1",
"ipv6": {
"gua": "2600:6c4a:787f:4f1e::1",
"ula": "fd9e:1a04:f01d:30::1",
"lla": "fe80::1"
}
},
"enp2s0": {
"name": "enp2s0",
"internal_domain": true,

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

@ -22,7 +22,7 @@ in {
})
# Downstream advertising interfaces.
++ lib.forEach [ enp2s0 lab0 lan0 corp0 guest0 iot0 tengb0 ] (ifi: {
++ lib.forEach [ enp2s0 lab0 lan0 guest0 iot0 tengb0 ] (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 corp0 guest0 iot0 lab0 tengb0 ];
lans = with vars.interfaces; [ enp2s0 lan0 guest0 iot0 lab0 tengb0 ];
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 ${corp0.name}/30/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 ${tengb0.name}/110/64
# IPv4 DHCP ISP settings overrides.
static domain_name_servers=${vars.localhost.ipv4}
@ -54,7 +54,6 @@ in {
# LAN interfaces.
${enp2s0.name} = mkInterface enp2s0;
${lan0.name} = mkInterface lan0;
${corp0.name} = mkInterface corp0;
${lab0.name} = mkInterface lab0;
${guest0.name} = mkInterface guest0;
${iot0.name} = mkInterface iot0;
@ -74,10 +73,6 @@ in {
id = 10;
interface = "${enp2s0.name}";
};
${corp0.name} = {
id = 30;
interface = "${enp2s0.name}";
};
${iot0.name} = {
id = 66;
interface = "${enp2s0.name}";

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

@ -33,7 +33,7 @@ let
# LAN interfaces, segmented into trusted, limited, and untrusted groups.
metered_lans = with vars.interfaces; [ enp2s0 tengb0 ];
trusted_lans = with vars.interfaces; [ enp2s0 lan0 lab0 tengb0 wg0 ];
limited_lans = with vars.interfaces; [ corp0 guest0 ];
limited_lans = with vars.interfaces; [ guest0 ];
untrusted_lans = with vars.interfaces; [ iot0 ];
# ICMP filtering.