From 83aa4002bd313bbc01aa7545898737f7a5b6c956 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Tue, 6 Aug 2024 11:49:25 +0200 Subject: [PATCH] mumble: remove traces --- clanModules/mumble/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/clanModules/mumble/default.nix b/clanModules/mumble/default.nix index 785cf6d4f..1c38023e4 100644 --- a/clanModules/mumble/default.nix +++ b/clanModules/mumble/default.nix @@ -5,25 +5,24 @@ ... }: let - clanDir = lib.trace config.clan.core.clanDir config.clan.core.clanDir; + clanDir = config.clan.core.clanDir; machineDir = clanDir + "/machines/"; machinesFileSet = builtins.readDir machineDir; machines = lib.mapAttrsToList (name: _: name) machinesFileSet; - machineJson = builtins.toJSON (lib.trace machines machines); + machineJson = builtins.toJSON machines; certificateMachinePath = machines: machineDir + "/${machines}" + "/facts/mumble-cert"; certificatesUnchecked = builtins.map ( machine: let fullPath = certificateMachinePath machine; in - if builtins.pathExists (lib.trace fullPath fullPath) then machine else null + if builtins.pathExists fullPath then machine else null ) machines; certificate = lib.filter (machine: machine != null) certificatesUnchecked; machineCert = builtins.map ( - machine: - lib.trace machine (lib.nameValuePair machine (builtins.readFile (certificateMachinePath machine))) + machine: (lib.nameValuePair machine (builtins.readFile (certificateMachinePath machine))) ) certificate; - machineCertJson = builtins.toJSON (lib.trace machineCert machineCert); + machineCertJson = builtins.toJSON machineCert; in {