DGNum/infrastructure
13
6
Fork 3
Code Issues 20 Pull requests 8 Projects 1 Releases Packages Wiki Activity Actions

feat: init AP management via Colmena and Liminix #110

Open
rlahfa wants to merge 28 commits from colmena-liminix into main
pull from: colmena-liminix
merge into: DGNum:main
Conversation 0 Commits 28 Files changed 18 +14 -8
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c08d6c464f - Show all commits

22
machines/ap01/_configuration.nix
View file

@ -9,13 +9,11 @@ let
inherit (pkgs.pseudofile) symlink dir; inherit (pkgs.pseudofile) symlink dir;
inherit (pkgs) serviceFns; inherit (pkgs) serviceFns;
svc = config.system.service; svc = config.system.service;
# secrets-1 = { secrets-1 = {
# ssid = "DGNum 2G prototype (N)"; ssid = "DGNum 2G prototype (N)";
# # wpa_passphrase = "diamond dogs"; };
# };
secrets-2 = { secrets-2 = {
ssid = "DGNum 5G prototype (AX)"; ssid = "DGNum 5G prototype (AX)";
# wpa_passphrase = "diamond dogs";
}; };
baseParams = { baseParams = {
country_code = "FR"; country_code = "FR";
@ -121,6 +119,11 @@ rec {
primary = services.int; primary = services.int;
members = { members = {
lan.member = config.hardware.networkInterfaces.lan; lan.member = config.hardware.networkInterfaces.lan;
wlan0 = {
member = config.hardware.networkInterfaces.wlan0;
# Bridge only once hostapd is ready.
dependencies = [ config.services.hostap-1-ready ];
};
wlan1 = { wlan1 = {
member = config.hardware.networkInterfaces.wlan1; member = config.hardware.networkInterfaces.wlan1;
# Bridge only once hostapd is ready. # Bridge only once hostapd is ready.
@ -198,9 +201,12 @@ rec {
}; };
# wlan0 is the 2.4GHz interface. # wlan0 is the 2.4GHz interface.
# services.hostap-1 = mkWifiSta ( services.hostap-1 = mkWifiSta (
# baseParams // radiusKeyMgmt baseParams // radiusKeyMgmt
# ) config.hardware.networkInterfaces.wlan0 secrets-1; ) config.hardware.networkInterfaces.wlan0 secrets-1;
services.hostap-1-ready = svc.hostapd-ready.build {
interface = config.hardware.networkInterfaces.wlan0;
};
# wlan1 is the 5GHz interface, e.g. AX capable. # wlan1 is the 5GHz interface, e.g. AX capable.
services.hostap-2 = mkWifiSta ( services.hostap-2 = mkWifiSta (
baseParams // clientRadius // externalRadius // radiusKeyMgmt // modernParams baseParams // clientRadius // externalRadius // radiusKeyMgmt // modernParams