feat(access): optional slaac on int

This commit is contained in:
arcnmx 2024-03-29 13:59:28 -07:00
parent f3d9d2f1eb
commit 7a2d834742
7 changed files with 87 additions and 12 deletions

View file

@ -4,9 +4,12 @@
inherit (lib.modules) mkIf mkOptionDefault;
inherit (lib.trivial) mapNullable;
networkModule = { config, name, system, ... }: let
slaacPrefix = {
local = "fd0a:";
#int = "fd0c:";
knownNetworks = {
local.slaac = {
enable = true;
prefix = "fd0a:";
};
int.slaac.prefix = "fd0c:";
};
in {
options = with lib.types; {
@ -47,8 +50,10 @@
};
config = {
slaac = {
enable = mkOptionDefault (slaacPrefix ? ${config.name});
prefix = mkIf (slaacPrefix ? ${config.name}) (mkOptionDefault slaacPrefix.${config.name});
enable = mkOptionDefault (knownNetworks.${config.name}.slaac.enable or false);
prefix = mkIf (knownNetworks.${config.name}.slaac.prefix or null != null) (
mkOptionDefault knownNetworks.${config.name}.slaac.prefix
);
postfix = mkIf (config.macAddress != null) (mkOptionDefault (eui64 config.macAddress));
};
domain = mkOptionDefault "${config.name}.${system.access.domain}";

View file

@ -1,7 +1,7 @@
{config, lib, inputs, ...}: let
inherit (inputs.self.lib.lib) unmerged eui64 toHexStringLower mkAlmostOptionDefault mapAlmostOptionDefaults;
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.modules) mkIf mkMerge mkOptionDefault;
inherit (lib.modules) mkIf mkMerge mkDefault mkOptionDefault;
inherit (lib.attrsets) attrValues;
inherit (lib.lists) elem findSingle findFirst;
inherit (lib.strings) hasPrefix removePrefix replaceStrings removeSuffix;
@ -78,6 +78,11 @@
enable = mkEnableOption "systemd.network" // {
default = true;
};
name = mkOption {
type = str;
default = config.name;
description = "network unit name";
};
networkSettings = mkOption {
type = unmerged.types.attrs;
};
@ -105,7 +110,7 @@
];
networkd.networkSettings = {
name = mkAlmostOptionDefault config.name;
ipv6AcceptRAConfig = mkIf (config.address6 == "auto" && config.local.enable) {
ipv6AcceptRAConfig = mkIf config.local.enable {
UseDNS = mkOptionDefault false;
DHCPv6Client = mkOptionDefault false;
};
@ -140,15 +145,27 @@
);
};
};
confInternal = {
confInternal = let
index = system.proxmox.vm.id - internalOffset;
in {
name = mkIf system.proxmox.container.enable (mkAlmostOptionDefault "eth9");
bridge = mkAlmostOptionDefault "vmbr9";
address4 = mkAlmostOptionDefault "10.9.1.${toString (system.proxmox.vm.id - internalOffset)}/24";
address6 = mkAlmostOptionDefault "fd0c::${toHexStringLower (system.proxmox.vm.id - internalOffset)}/64";
address4 = mkAlmostOptionDefault "10.9.1.${toString index}/24";
address6 = mkAlmostOptionDefault "fd0c::${toHexStringLower index}/64";
macAddress = mkIf (system.proxmox.network.interfaces.net0.macAddress or null != null && hasPrefix "BC:24:11:" system.proxmox.network.interfaces.net0.macAddress) (mkAlmostOptionDefault (
replaceStrings [ "BC:24:11:" ] [ "BC:24:19:" ] system.proxmox.network.interfaces.net0.macAddress
));
networkd.networkSettings.linkConfig.RequiredForOnline = false;
networkd.networkSettings = {
domains = mkDefault [ ]; # int.${domain}?
linkConfig.RequiredForOnline = false;
ipv6AcceptRAConfig = {
Token = mkOptionDefault "static:::${toHexStringLower index}";
DHCPv6Client = mkOptionDefault false;
};
networkConfig = {
IPv6PrivacyExtensions = mkOptionDefault "no";
};
};
};
in mkMerge [
conf

29
nixos/int.nix Normal file
View file

@ -0,0 +1,29 @@
{config, lib, access, ...}: let
inherit (lib.modules) mkDefault;
in {
config = {
systemd.network.networks.eth9 = {config, ...}: {
networkConfig = {
IPv6SendRA = mkDefault true;
};
ipv6SendRAConfig = {
Managed = mkDefault false;
EmitDNS = mkDefault true;
DNS = [ (access.getAddress6For "utsuho" "int") ];
# Domains = [ "int.${networking.domain}" ];
EmitDomains = mkDefault false;
RouterPreference = mkDefault "low";
RouterLifetimeSec = 0;
};
ipv6Prefixes = [
{
ipv6PrefixConfig = {
Prefix = "fd0c::/64";
Assign = true;
Token = config.ipv6AcceptRAConfig.Token;
};
}
];
};
};
}

View file

@ -25,7 +25,7 @@ in {
proxmoxLXC.privileged = mkIf (proxmox.container.enable && proxmox.container.privileged) true;
systemd.network = mkIf proxmox.enabled (mkMerge (mapAttrsToList (_: interface: mkIf (interface.enable && interface.networkd.enable) {
networks.${interface.name} = unmerged.mergeAttrs interface.networkd.networkSettings;
networks.${interface.networkd.name} = unmerged.mergeAttrs interface.networkd.networkSettings;
}) proxmox.network.interfaces));
networking.firewall.interfaces.int = let

View file

@ -8,4 +8,25 @@
services.avahi.hostName = "";
system.stateVersion = "23.11";
environment.etc."systemd/network/eth9.network.d/int.conf".text = ''
[Match]
Name=eth9
Type=ether
[Link]
RequiredForOnline=false
[Network]
IPv6AcceptRA=true
IPv6SendRA=false
DHCP=no
[IPv6Prefix]
AddressAutoconfiguration=false
Prefix=fd0c::/64
Assign=true
[IPv6AcceptRA]
DHCPv6Client=false
'';
}

View file

@ -11,3 +11,5 @@ method=manual
address1=fd0c::aa/64
may-fail=true
method=manual
addr-gen-mode=eui64
token=::aa

View file

@ -7,6 +7,7 @@ in {
nixos.sops
nixos.base
nixos.reisen-ct
nixos.int
nixos.ipa
nixos.cloudflared
nixos.nginx