nixos-module/container/lxc-config: simplify
This commit is contained in:
parent
c41f5c56a6
commit
b8d27ab9ca
|
@ -4,6 +4,8 @@ let
|
||||||
|
|
||||||
inherit (config.networking) hostName;
|
inherit (config.networking) hostName;
|
||||||
|
|
||||||
|
interfaces = config.site.hosts.${hostName}.physicalInterfaces;
|
||||||
|
|
||||||
# linux iface name max length = 15
|
# linux iface name max length = 15
|
||||||
shortenNetName = name:
|
shortenNetName = name:
|
||||||
if builtins.match "priv(.*)" name != null
|
if builtins.match "priv(.*)" name != null
|
||||||
|
@ -21,27 +23,8 @@ let
|
||||||
else ifname;
|
else ifname;
|
||||||
|
|
||||||
# `lxc.net.*` formatter for lxc.container.conf files
|
# `lxc.net.*` formatter for lxc.container.conf files
|
||||||
netConfig = ctName: interfaces:
|
netConfig =
|
||||||
let
|
let
|
||||||
config = map (netName:
|
|
||||||
let
|
|
||||||
ifData = interfaces.${netName};
|
|
||||||
in {
|
|
||||||
type = ifData.type;
|
|
||||||
name = checkIfname netName;
|
|
||||||
flags = "up";
|
|
||||||
hwaddr = if ifData ? hwaddr && ifData.hwaddr != null
|
|
||||||
then ifData.hwaddr
|
|
||||||
else "0A:14:48:xx:xx:xx";
|
|
||||||
} // (lib.optionalAttrs (ifData.type == "veth") {
|
|
||||||
veth.pair = checkIfname "${shortenNetName ctName}-${shortenNetName netName}";
|
|
||||||
veth.mode = checkIfname "bridge";
|
|
||||||
link = checkIfname netName;
|
|
||||||
}) // (lib.optionalAttrs (ifData.type == "phys") {
|
|
||||||
link = checkIfname "ext-${netName}";
|
|
||||||
})
|
|
||||||
) (builtins.attrNames interfaces);
|
|
||||||
|
|
||||||
attrNamesOrdered = attrs:
|
attrNamesOrdered = attrs:
|
||||||
if attrs ? type
|
if attrs ? type
|
||||||
then [ "type" ] ++ lib.remove "type" (builtins.attrNames attrs)
|
then [ "type" ] ++ lib.remove "type" (builtins.attrNames attrs)
|
||||||
|
@ -69,8 +52,28 @@ let
|
||||||
map ({ e, i }: serialize "${name}.${toString i}" e) (enumerate x 0)
|
map ({ e, i }: serialize "${name}.${toString i}" e) (enumerate x 0)
|
||||||
)
|
)
|
||||||
else throw "Invalid data in lxc net config for ${name}: ${lib.generators.toPretty {} x}";
|
else throw "Invalid data in lxc net config for ${name}: ${lib.generators.toPretty {} x}";
|
||||||
|
|
||||||
in
|
in
|
||||||
serialize "lxc.net" config;
|
serialize "lxc.net" (
|
||||||
|
map (netName:
|
||||||
|
let
|
||||||
|
ifData = interfaces.${netName};
|
||||||
|
in {
|
||||||
|
type = ifData.type;
|
||||||
|
name = checkIfname netName;
|
||||||
|
flags = "up";
|
||||||
|
hwaddr = if ifData ? hwaddr && ifData.hwaddr != null
|
||||||
|
then ifData.hwaddr
|
||||||
|
else "0A:14:48:xx:xx:xx";
|
||||||
|
} // (lib.optionalAttrs (ifData.type == "veth") {
|
||||||
|
veth.pair = checkIfname "${shortenNetName hostName}-${shortenNetName netName}";
|
||||||
|
veth.mode = checkIfname "bridge";
|
||||||
|
link = checkIfname netName;
|
||||||
|
}) // (lib.optionalAttrs (ifData.type == "phys") {
|
||||||
|
link = checkIfname "ext-${netName}";
|
||||||
|
})
|
||||||
|
) (builtins.attrNames interfaces)
|
||||||
|
);
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
@ -106,6 +109,6 @@ in
|
||||||
lxc.cgroup.devices.allow = c 108:0 rwm
|
lxc.cgroup.devices.allow = c 108:0 rwm
|
||||||
lxc.cgroup2.devices.allow = c 108:0 rwm
|
lxc.cgroup2.devices.allow = c 108:0 rwm
|
||||||
|
|
||||||
${netConfig hostName config.site.hosts.${hostName}.physicalInterfaces}
|
${netConfig}
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue