yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'mumble: remove traces' (#1850) from kenji/clan-core:mumble/remove-traces into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1850
This commit is contained in:
kenji
2024-08-06 10:09:20 +00:00
parent 4b757d62a2 83aa4002bd
commit 329b70d653
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
clanModules/mumble/default.nix
View File

@@ -5,25 +5,24 @@
... ...
}: }:
let let
clanDir = lib.trace config.clan.core.clanDir config.clan.core.clanDir; clanDir = config.clan.core.clanDir;
machineDir = clanDir + "/machines/"; machineDir = clanDir + "/machines/";
machinesFileSet = builtins.readDir machineDir; machinesFileSet = builtins.readDir machineDir;
machines = lib.mapAttrsToList (name: _: name) machinesFileSet; machines = lib.mapAttrsToList (name: _: name) machinesFileSet;
machineJson = builtins.toJSON (lib.trace machines machines); machineJson = builtins.toJSON machines;
certificateMachinePath = machines: machineDir + "/${machines}" + "/facts/mumble-cert"; certificateMachinePath = machines: machineDir + "/${machines}" + "/facts/mumble-cert";
certificatesUnchecked = builtins.map ( certificatesUnchecked = builtins.map (
machine: machine:
let let
fullPath = certificateMachinePath machine; fullPath = certificateMachinePath machine;
in in
if builtins.pathExists (lib.trace fullPath fullPath) then machine else null if builtins.pathExists fullPath then machine else null
) machines; ) machines;
certificate = lib.filter (machine: machine != null) certificatesUnchecked; certificate = lib.filter (machine: machine != null) certificatesUnchecked;
machineCert = builtins.map ( machineCert = builtins.map (
machine: machine: (lib.nameValuePair machine (builtins.readFile (certificateMachinePath machine)))
lib.trace machine (lib.nameValuePair machine (builtins.readFile (certificateMachinePath machine)))
) certificate; ) certificate;
machineCertJson = builtins.toJSON (lib.trace machineCert machineCert); machineCertJson = builtins.toJSON machineCert;
in in
{ {