Cloonar/nixos
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change networking

Browse Source
This commit is contained in:
Dominik Polakovics Polakovics
2023-12-01 22:27:42 +01:00
parent 4158730c6a
commit 6af562cc73
3 changed files with 73 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
hosts/fw.cloonar.com/modules/dhcp4.nix
View File

@@ -59,41 +59,41 @@
} }
]; ];
} }
# { {
# pools = [ pools = [
# { {
# pool = "10.42.97.100 - 10.42.97.240"; pool = "10.42.101.100 - 10.42.101.240";
# } }
# ]; ];
# subnet = "10.42.97.0/24"; subnet = "10.42.101.0/24";
# interface = "server"; interface = "infrastructure";
# option-data = [ option-data = [
# { {
# name = "routers"; name = "routers";
# data = "10.42.97.1"; data = "10.42.101.1";
# } }
# { {
# name = "domain-name"; name = "domain-name";
# data = "cloonar.com"; data = "cloonar.com";
# } }
# { {
# name = "domain-name-servers"; name = "domain-name-servers";
# data = "10.42.97.1"; data = "10.42.101.1";
# } }
# ]; ];
# reservations = [ reservations = [
# { {
# hw-address = "0a:0e:52:a2:f7:8e"; hw-address = "0a:0e:52:a2:f7:8e";
# ip-address = "10.42.97.20"; ip-address = "10.42.101.20";
# server-hostname = "home-assistant.cloonar.com"; server-hostname = "home-assistant.cloonar.com";
# } }
# { {
# hw-address = "36:2a:c9:26:d7:77"; hw-address = "36:2a:c9:26:d7:77";
# ip-address = "10.42.97.118"; ip-address = "10.42.101.118";
# server-hostname = "git.cloonar.com"; server-hostname = "git.cloonar.com";
# } }
# ]; ];
# } }
{ {
pools = [ pools = [
{ {
@@ -120,30 +120,30 @@
{ {
pools = [ pools = [
{ {
pool = "10.42.100.100 - 10.42.100.240"; pool = "10.42.254.10 - 10.42.254.254";
} }
]; ];
subnet = "10.42.100.0/24"; subnet = "10.42.254.0/24";
interface = "guest"; interface = "guest";
option-data = [ option-data = [
{ {
name = "routers"; name = "routers";
data = "10.42.100.1"; data = "10.42.254.1";
} }
]; ];
} }
{ {
pools = [ pools = [
{ {
pool = "10.42.254.100 - 10.42.254.240"; pool = "10.42.100.100 - 10.42.100.240";
} }
]; ];
subnet = "10.42.254.0/24"; subnet = "10.42.100.0/24";
interface = "smart"; interface = "smart";
option-data = [ option-data = [
{ {
name = "routers"; name = "routers";
data = "10.42.254.1"; data = "10.42.100.1";
} }
{ {
name = "domain-name"; name = "domain-name";
@@ -151,73 +151,73 @@
} }
{ {
name = "domain-name-servers"; name = "domain-name-servers";
data = "10.42.254.1"; data = "10.42.100.1";
} }
]; ];
reservations = [ reservations = [
{ {
hw-address = "7a:5a:d6:d0:29:fe"; hw-address = "7a:5a:d6:d0:29:fe";
ip-address = "10.42.254.10"; ip-address = "10.42.100.10";
server-hostname = "home-assistant.cloonar.smart"; server-hostname = "home-assistant.cloonar.smart";
} }
{ {
hw-address = "60:a4:23:97:4a:ec"; hw-address = "60:a4:23:97:4a:ec";
ip-address = "10.42.254.21"; ip-address = "10.42.100.21";
server-hostname = "shellymotionsensor-60A423974AEC.cloonar.smart"; server-hostname = "shellymotionsensor-60A423974AEC.cloonar.smart";
} }
{ {
hw-address = "8c:aa:b5:61:6f:e2"; hw-address = "8c:aa:b5:61:6f:e2";
ip-address = "10.42.254.103"; ip-address = "10.42.100.103";
server-hostname = "ShellyBulbDuo-8CAAB5616FE2.cloonar.smart"; server-hostname = "ShellyBulbDuo-8CAAB5616FE2.cloonar.smart";
} }
{ {
hw-address = "8c:aa:b5:61:6e:9e"; hw-address = "8c:aa:b5:61:6e:9e";
ip-address = "10.42.254.104"; ip-address = "10.42.100.104";
server-hostname = "ShellyBulbDuo-8CAAB5616E9E.cloonar.smart"; server-hostname = "ShellyBulbDuo-8CAAB5616E9E.cloonar.smart";
} }
{ {
hw-address = "cc:50:e3:bc:27:64"; hw-address = "cc:50:e3:bc:27:64";
ip-address = "10.42.254.112"; ip-address = "10.42.100.112";
server-hostname = "Nuki_Bridge_1A753F72.cloonar.smart"; server-hostname = "Nuki_Bridge_1A753F72.cloonar.smart";
} }
{ {
hw-address = "e8:db:84:aa:19:6d"; hw-address = "e8:db:84:aa:19:6d";
ip-address = "10.42.254.116"; ip-address = "10.42.100.116";
server-hostname = "shellybutton1-E8DB84AA196D.cloonar.smart"; server-hostname = "shellybutton1-E8DB84AA196D.cloonar.smart";
} }
{ {
hw-address = "e8:db:84:a9:ea:be"; hw-address = "e8:db:84:a9:ea:be";
ip-address = "10.42.254.117"; ip-address = "10.42.100.117";
server-hostname = "ShellyBulbDuo-E8DB84A9EABE.cloonar.smart"; server-hostname = "ShellyBulbDuo-E8DB84A9EABE.cloonar.smart";
} }
{ {
hw-address = "e8:db:84:a9:d1:8b"; hw-address = "e8:db:84:a9:d1:8b";
ip-address = "10.42.254.119"; ip-address = "10.42.100.119";
server-hostname = "shellycolorbulb-E8DB84A9D18B.cloonar.smart"; server-hostname = "shellycolorbulb-E8DB84A9D18B.cloonar.smart";
} }
{ {
hw-address = "3c:61:05:e5:96:e0"; hw-address = "3c:61:05:e5:96:e0";
ip-address = "10.42.254.120"; ip-address = "10.42.100.120";
server-hostname = "shellycolorbulb-3C6105E596E0.cloonar.smart"; server-hostname = "shellycolorbulb-3C6105E596E0.cloonar.smart";
} }
{ {
hw-address = "e8:db:84:a9:d7:ef"; hw-address = "e8:db:84:a9:d7:ef";
ip-address = "10.42.254.121"; ip-address = "10.42.100.121";
server-hostname = "shellycolorbulb-E8DB84A9D7EF.cloonar.smart"; server-hostname = "shellycolorbulb-E8DB84A9D7EF.cloonar.smart";
} }
{ {
hw-address = "e8:db:84:aa:51:aa"; hw-address = "e8:db:84:aa:51:aa";
ip-address = "10.42.254.122"; ip-address = "10.42.100.122";
server-hostname = "shellycolorbulb-E8DB84AA51AA.cloonar.smart"; server-hostname = "shellycolorbulb-E8DB84AA51AA.cloonar.smart";
} }
{ {
hw-address = "34:6f:24:f3:af:ad"; hw-address = "34:6f:24:f3:af:ad";
ip-address = "10.42.254.137"; ip-address = "10.42.100.137";
server-hostname = "daikin86604.cloonar.smart"; server-hostname = "daikin86604.cloonar.smart";
} }
{ {
hw-address = "34:6f:24:c1:f8:54"; hw-address = "34:6f:24:c1:f8:54";
ip-address = "10.42.254.139"; ip-address = "10.42.100.139";
server-hostname = "daikin53800.cloonar.smart"; server-hostname = "daikin53800.cloonar.smart";
} }
]; ];

28
hosts/fw.cloonar.com/modules/networking.nix
View File

@@ -17,10 +17,6 @@
matchConfig.PermanentMACAddress = "a8:b8:e0:00:43:c2"; matchConfig.PermanentMACAddress = "a8:b8:e0:00:43:c2";
linkConfig.Name = "lan"; linkConfig.Name = "lan";
}; };
"30-multimedia" = {
matchConfig.PermanentMACAddress = "a8:b8:e0:00:43:c3";
linkConfig.Name = "multimedia";
};
}; };
}; };
@@ -30,16 +26,20 @@
nameservers = [ "9.9.9.9" "149.112.112.112" ]; nameservers = [ "9.9.9.9" "149.112.112.112" ];
# Define VLANS # Define VLANS
vlans = { vlans = {
# multimedia = { infrastructure = {
# id = 3; id = 101;
# interface = "enp5s0"; interface = "enp5s0";
# }; };
multimedia = {
id = 99;
interface = "enp5s0";
};
smart = { smart = {
id = 4094; id = 100;
interface = "enp5s0"; interface = "enp5s0";
}; };
guest = { guest = {
id = 100; id = 254;
interface = "enp5s0"; interface = "enp5s0";
}; };
}; };
@@ -47,7 +47,7 @@
interfaces = { interfaces = {
# Don't request DHCP on the physical interfaces # Don't request DHCP on the physical interfaces
lan.useDHCP = false; lan.useDHCP = false;
server.useDHCP = false; enp4s0.useDHCP = false;
enp5s0.useDHCP = false; enp5s0.useDHCP = false;
# Handle the VLANs # Handle the VLANs
@@ -64,6 +64,12 @@
# prefixLength = 24; # prefixLength = 24;
# }]; # }];
# }; # };
infrastructure = {
ipv4.addresses = [{
address = "10.42.101.1";
prefixLength = 24;
}];
};
multimedia = { multimedia = {
ipv4.addresses = [{ ipv4.addresses = [{
address = "10.42.99.1"; address = "10.42.99.1";

1
hosts/fw.cloonar.com/modules/unbound.nix
View File

@@ -10,6 +10,7 @@
"10.42.97.0/24 allow" "10.42.97.0/24 allow"
"10.42.98.0/24 allow" "10.42.98.0/24 allow"
"10.42.99.0/24 allow" "10.42.99.0/24 allow"
"10.42.101.0/24 allow"
"10.42.254.0/24 allow" "10.42.254.0/24 allow"
]; ];
tls-cert-bundle = "/var/lib/acme/fw.cloonar.com/fullchain.pem"; tls-cert-bundle = "/var/lib/acme/fw.cloonar.com/fullchain.pem";