dan/liminix
1
0
Fork 5
Code

unbreak pppoe ci job

Browse Source
This commit is contained in:
Daniel Barlow 2024-09-06 00:29:42 +01:00
parent cc47515cf8
commit e0725489ca
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ppp/common.nix
View File

@ -78,6 +78,6 @@ let
inherit dependencies; inherit dependencies;
}; };
in svc.secrets.subscriber.build { in svc.secrets.subscriber.build {
watch = [ username password ]; watch = lib.filter (n: typeOf n=="lambda") [ username password ];
inherit service; inherit service;
} }

1
modules/ppp/default.nix
View File

@ -25,6 +25,7 @@ let
inherit description; inherit description;
}; };
in { in {
imports = [ ../secrets ];
options = { options = {
system.service.pppoe = mkOption { system.service.pppoe = mkOption {
type = liminix.lib.types.serviceDefn; type = liminix.lib.types.serviceDefn;

6
modules/secrets/subscriber.nix
View File

@ -5,7 +5,7 @@
let let
inherit (liminix.services) oneshot longrun; inherit (liminix.services) oneshot longrun;
inherit (builtins) length head toString; inherit (builtins) length head toString;
inherit (lib) unique optional; inherit (lib) unique optional optionals;
inherit (service) name; inherit (service) name;
watched-services = unique (map (f: f "service") watch); watched-services = unique (map (f: f "service") watch);
@ -46,6 +46,6 @@ in service.overrideAttrs(o: {
buildInputs = (lim.orEmpty o.buildInputs) ++ buildInputs = (lim.orEmpty o.buildInputs) ++
optional (watched-service != null) watcher; optional (watched-service != null) watcher;
dependencies = (lim.orEmpty o.dependencies) ++ dependencies = (lim.orEmpty o.dependencies) ++
optional (watched-service != null) watcher ++ optionals (watched-service != null)
optional (watched-service != null) watched-service; [ watcher watched-service ];
}) })