lbailly/liminix
1
0
Fork 0
forked from DGNum/liminix
Code Pull requests 2 Activity Actions

use module-based-service for hostapd

Browse source
This commit is contained in:
Daniel Barlow 2023-07-16 17:50:06 +01:00
parent 17abd42cf3
commit 648ea5613b
3 changed files with 40 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
examples/rotuer.nix
View file

@ -11,7 +11,6 @@ let
secrets = import ./rotuer-secrets.nix;
inherit (pkgs.liminix.networking)
address
hostapd
interface
route;
inherit (pkgs.liminix.services) oneshot longrun bundle target;
@ -36,6 +35,7 @@ in rec {
../modules/ppp
../modules/dnsmasq
../modules/firewall
../modules/hostapd
];
rootfsType = "jffs2";
hostname = "rotuer";
@ -45,7 +45,8 @@ in rec {
};
};
services.hostap = hostapd (config.hardware.networkInterfaces.wlan_24) {
services.hostap = config.system.service.hostapd {
interface = config.hardware.networkInterfaces.wlan_24;
params = {
ssid = "liminix";
country_code = "GB";
@ -62,7 +63,8 @@ in rec {
};
};
services.hostap5 = hostapd (config.hardware.networkInterfaces.wlan_5) {
services.hostap5 = config.system.service.hostapd {
interface = config.hardware.networkInterfaces.wlan_5;
params = rec {
ssid = "liminix_5";
country_code = "GB";

13
modules/hostapd/default.nix Normal file
View file

@ -0,0 +1,13 @@
{ lib, pkgs, config, ...}:
let
inherit (lib) mkOption types;
in {
options = {
system.service.hostapd = mkOption {
type = types.functionTo types.package;
};
};
config = {
system.service.hostapd = pkgs.callPackage ./service.nix {};
};
}

33
pkgs/liminix-tools/networking/hostapd.nix → modules/hostapd/service.nix
View file

@ -1,23 +1,34 @@
# This is not a friendly interface to configuring a wireless AP: it
# just passes everything straight through to the hostapd config. When
# we've worked out what the sensible options are to expose, we'll add
# them as top-level attributes and rename params to extraParams
{
liminix
, hostapd
, lib
, writeText
}:
interface:
{
params ? {}
, lib
}:
let
inherit (liminix.services) longrun;
inherit (lib) concatStringsSep mapAttrsToList;
inherit (builtins) toString;
inherit (liminix.lib) typeChecked;
inherit (lib) mkOption types;
# This is not a friendly interface to configuring a wireless AP: it
# just passes everything straight through to the hostapd config.
# When we've worked out what the sensible options are to expose,
# we'll add them as top-level attributes and rename params to
# extraParams
t = {
interface = mkOption {
type = liminix.lib.types.service;
};
params = mkOption {
type = types.attrs;
};
};
in
args:
let
inherit (typeChecked "hostapd" t args)
interface params;
name = "${interface.device}.hostapd";
defaults = {
driver = "nl80211";