gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(access): optional slaac on int

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

15
modules/system/network/networks.nix
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}";

29
modules/system/proxmox/network.nix
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