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

fix: realize mkif earlier to disable local-vms definition

Browse source
This commit is contained in:
oddlama 2023-06-21 01:43:00 +02:00
parent b545967e7a
commit e32d5575b4
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

24
modules/microvms.nix
View file

@ -167,18 +167,8 @@
extra.networking.renameInterfacesByMac.${vmCfg.networking.mainLinkName} = mac; extra.networking.renameInterfacesByMac.${vmCfg.networking.mainLinkName} = mac;
systemd.network.networks = let systemd.network.networks =
wgConfig = parentConfig.extra.wireguard."${nodeName}-local-vms".unitConfName; {
in {
# Remove requirement for the wireguard interface to come online,
# to allow microvms to be deployed more easily (otherwise they
# would not come online if the private key wasn't rekeyed yet).
# FIXME ideally this would be conditional at runtime if the
# agenix activation had an error, but this is not trivial.
${wgConfig} = mkIf vmCfg.localWireguard {
linkConfig.RequiredForOnline = "no";
};
"10-${vmCfg.networking.mainLinkName}" = { "10-${vmCfg.networking.mainLinkName}" = {
matchConfig.MACAddress = mac; matchConfig.MACAddress = mac;
DHCP = "yes"; DHCP = "yes";
@ -189,6 +179,16 @@
}; };
linkConfig.RequiredForOnline = "routable"; linkConfig.RequiredForOnline = "routable";
}; };
}
// optionalAttrs vmCfg.localWireguard {
# Remove requirement for the wireguard interface to come online,
# to allow microvms to be deployed more easily (otherwise they
# would not come online if the private key wasn't rekeyed yet).
# FIXME ideally this would be conditional at runtime if the
# agenix activation had an error, but this is not trivial.
${parentConfig.extra.wireguard."${nodeName}-local-vms".unitConfName} = {
linkConfig.RequiredForOnline = "no";
};
}; };
# TODO mkForce nftables # TODO mkForce nftables