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

move some secret-watching stuff from hostapd to secrets

Browse Source
This commit is contained in:
Daniel Barlow
2024-08-20 21:49:11 +01:00
parent 97defc2076
commit 264d83c98d
3 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/secrets/subscriber.nix
View File

@@ -4,9 +4,21 @@
{ watch, service, action } :
let
inherit (liminix.services) oneshot longrun;
inherit (builtins) toString;
inherit (builtins) length head toString;
inherit (lib) unique optional;
inherit (service) name;
watcher = let name' = "check-${name}"; in longrun {
watched-services = unique (map (f: f.service) watch);
paths = unique (map (f: f.path) watch);
watched-service =
if length watched-services == 0
then null
else if length watched-services == 1
then head watched-services
else throw "cannot subscribe to more than one source service for secrets";
watcher = let name' = "restart-${name}"; in longrun {
name = name';
run = ''
dir=/run/service/${name}
@@ -14,10 +26,12 @@ let
if test -e $dir/notification-fd; then flag="-U"; else flag="-u"; fi
${s6}/bin/s6-svwait $flag /run/service/${name} || exit
PATH=${s6-rc}/bin:${s6}/bin:$PATH
${watch-outputs}/bin/watch-outputs -r ${name} ${watch.service} ${lib.concatStringsSep " " watch.paths}
${watch-outputs}/bin/watch-outputs -r ${name} ${watched-service.name} ${lib.concatStringsSep " " paths}
'';
};
in service.overrideAttrs(o: {
buildInputs = (lim.orEmpty o.buildInputs) ++ [ watcher ];
dependencies = (lim.orEmpty o.dependencies) ++ [ watcher ];
buildInputs = (lim.orEmpty o.buildInputs) ++
optional (watched-service != null) watcher;
dependencies = (lim.orEmpty o.dependencies) ++
optional (watched-service != null) watcher;
})