extract bridge to module-based services

This commit is contained in:
Daniel Barlow 2023-07-20 11:46:19 +01:00
parent 86e73317ee
commit 9b70fd62f6
4 changed files with 88 additions and 23 deletions

View file

@ -37,14 +37,10 @@ in rec {
../modules/dnsmasq
../modules/firewall
../modules/hostapd
../modules/bridge
];
rootfsType = "jffs2";
hostname = "rotuer";
kernel = {
config = {
BRIDGE = "y";
};
};
services.hostap = svc.hostapd {
interface = config.hardware.networkInterfaces.wlan_24;
@ -87,29 +83,19 @@ in rec {
};
services.int =
let iface = interface {
type = "bridge";
device = "int";
let iface = svc.bridge.primary {
ifname = "int";
};
in address iface {
family = "inet4"; address ="10.8.0.1"; prefixLength = 16;
};
services.bridge =
let
primary = services.int;
addif = dev: oneshot {
name = "add-${dev.device}-to-bridge";
up = "${ifwait}/bin/ifwait -v ${dev.device} running && ip link set dev ${dev.device} master ${primary.device}";
down = "ip link set dev ${dev} nomaster";
dependencies = [ primary dev ];
};
in bundle {
name = "bridge-members";
contents = with config.hardware.networkInterfaces; map addif [
wlan_24 lan wlan_5
];
};
services.bridge = svc.bridge.members {
primary = services.int;
members = with config.hardware.networkInterfaces; [
wlan_24 lan wlan_5
];
};
services.ntp =
let config = writeText "chrony.conf" ''

View file

@ -0,0 +1,22 @@
{ lib, pkgs, config, ...}:
let
inherit (lib) mkOption types;
inherit (pkgs.liminix.services) oneshot;
in
{
options = {
system.service.bridge = {
primary = mkOption {
type = types.functionTo pkgs.liminix.lib.types.service;
};
members = mkOption {
type = types.functionTo pkgs.liminix.lib.types.service;
};
};
};
config = {
system.service.bridge.primary = pkgs.callPackage ./primary.nix {};
system.service.bridge.members = pkgs.callPackage ./members.nix {};
kernel.config.BRIDGE = "y";
};
}

View file

@ -0,0 +1,35 @@
{
liminix
, ifwait
, lib
}:
let
inherit (liminix.networking) interface;
inherit (liminix.services) bundle oneshot;
inherit (liminix.lib) typeChecked;
inherit (lib) mkOption types;
t = {
members = mkOption {
type = types.listOf liminix.lib.types.service;
description = "interfaces to add to the bridge";
};
primary = mkOption {
type = liminix.lib.types.service;
description = "bridge interface to add them to";
};
};
in
params:
let
inherit (typeChecked "bridge-members" t params) members primary;
addif = member :
oneshot {
name = "add-${member.device}-to-br-${primary.device}";
up = "${ifwait}/bin/ifwait ${member.device} running && ip link set dev ${member.device} master ${primary.device}";
down = "ip link set dev ${member.device} nomaster";
dependencies = [ primary member ];
};
in bundle {
name = "bridge-${primary.device}-members";
contents = map addif members;
}

View file

@ -0,0 +1,22 @@
{
liminix
, lib
}:
let
inherit (liminix.networking) interface;
inherit (liminix.lib) typeChecked;
inherit (lib) mkOption types;
t = {
ifname = mkOption {
type = types.str;
description = "interface name for the bridge device";
};
};
in
params:
let
inherit (typeChecked "bridge" t params) ifname;
in interface {
device = ifname;
type = "bridge";
}