newedge/liminix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert firewall service to new serviceDefn

Browse Source 
this is a bit kludgey with dependencies, need to
come back and look at that
This commit is contained in:
Daniel Barlow
2023-08-05 12:07:35 +01:00
parent fbb2c04132
commit 90c1d59aca
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/firewall/default.nix
View File

@@ -1,6 +1,7 @@
{ lib, pkgs, config, ...}:
let
inherit (lib) mkOption types;
inherit (pkgs) liminix;
inherit (pkgs.liminix.services) oneshot;
kconf = isModule :
@@ -36,13 +37,22 @@ in
{
options = {
system.service.firewall = mkOption {
type = types.anything; # types.functionTo pkgs.liminix.lib.types.service;
type = liminix.lib.types.serviceDefn;
};
};
config = {
system.service.firewall = params :
let svc = (pkgs.callPackage ./service.nix {}) params;
in svc // { dependencies = svc.dependencies ++ [loadModules]; };
system.service.firewall =
let svc = liminix.callService ./service.nix {
ruleset = mkOption {
type = types.attrsOf types.attrs; # we could usefully tighten this a bit :-)
description = "firewall ruleset";
};
};
in svc // {
build = args : (svc.build args) // {
dependencies = [ loadModules ] ++ (svc.dependencies or []);
};
};
# For historical reasons the kernel config is split between
# monolithic options and modules. TODO: go through this list