1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00

chore: use auto-ip for microvms, change ipv6 address scheme

This commit is contained in:
oddlama 2023-05-29 02:13:35 +02:00
parent c789e2de36
commit d18e86f981
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
4 changed files with 4 additions and 6 deletions

View file

@ -28,7 +28,7 @@ in {
extra.wireguard.proxy-sentinel.server = { extra.wireguard.proxy-sentinel.server = {
host = "TODO REMOVE"; host = "TODO REMOVE";
port = 51443; port = 51443;
reservedAddresses = ["10.0.43.0/24" "fd43::/120"]; reservedAddresses = ["10.43.0.0/24" "fd00:43::/120"];
openFirewallRules = ["untrusted-to-local"]; openFirewallRules = ["untrusted-to-local"];
}; };

View file

@ -6,7 +6,7 @@
inherit (config.lib.net) cidr; inherit (config.lib.net) cidr;
iotCidrv4 = "10.90.0.0/24"; iotCidrv4 = "10.90.0.0/24";
iotCidrv6 = "fd90::/64"; iotCidrv6 = "fd00:90::/64";
in { in {
networking.hostId = config.repo.secrets.local.networking.hostId; networking.hostId = config.repo.secrets.local.networking.hostId;

View file

@ -706,7 +706,7 @@ in {
}; };
macAcl = mkOption { macAcl = mkOption {
default = "allow"; default = "deny";
type = types.enum ["deny" "allow" "radius"]; type = types.enum ["deny" "allow" "radius"];
apply = x: apply = x:
getAttr x { getAttr x {

View file

@ -201,8 +201,6 @@
openFirewallRules = ["untrusted-to-local"]; openFirewallRules = ["untrusted-to-local"];
}; };
linkName = "local-vms"; linkName = "local-vms";
ipv4 = net.cidr.host vmCfg.id cfg.networking.wireguard.cidrv4;
ipv6 = net.cidr.host vmCfg.id cfg.networking.wireguard.cidrv6;
}; };
}; };
}; };
@ -246,7 +244,7 @@ in {
cidrv6 = mkOption { cidrv6 = mkOption {
type = net.types.cidrv6; type = net.types.cidrv6;
description = mdDoc "The ipv6 network address range to use for internal vm traffic."; description = mdDoc "The ipv6 network address range to use for internal vm traffic.";
default = "fddd::/64"; default = "fd00:172:31::/120";
}; };
port = mkOption { port = mkOption {