clan/clan-core
11
2
Fork 13
Code Issues 91 Pull Requests 5 Actions Packages Projects 1 Releases Wiki Activity

fix machines folder not beeing present yet
All checks were successful
checks-impure / test (pull_request) Successful in 11s
Details
checks / test (pull_request) Successful in 24s
Details

Browse Source
This commit is contained in:
Jörg Thalheim 2023-09-03 13:24:36 +02:00
parent 5dd318e637
commit 0a3982d0ac
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/build-clan/default.nix
View File

@ -5,13 +5,13 @@
}:
let
machinesDirs =
if builtins.pathExists (directory + /machines)
then builtins.readDir (directory + /machines)
if builtins.pathExists "${directory}/machines"
then builtins.readDir "${directory}/machines"
else { };
machineSettings = machineName:
if builtins.pathExists (directory + /machines/${machineName}/settings.json)
then builtins.fromJSON (builtins.readFile (directory + /machines/${machineName}/settings.json))
if builtins.pathExists "${directory}/machines/${machineName}/settings.json"
then builtins.fromJSON (builtins.readFile "${directory}/machines/${machineName}/settings.json")
else { };
nixosConfigurations = lib.mapAttrs

8
nixosModules/clanCore/secrets/sops.nix
View File

@ -48,18 +48,18 @@
secretsDir = config.clanCore.clanDir + "/sops/secrets";
encryptedForThisMachine = name: type:
let
symlink = secretsDir + "/${name}/machines/${config.clanCore.machineName}";
symlink = "${secretsDir}/${name}/machines/${config.clanCore.machineName}";
in
# WTF, nix bug, my symlink is in the nixos module detected as a directory also it works in the repl
type == "directory" && (builtins.readFileType symlink == "directory" || builtins.readFileType symlink == "symlink");
type == "directory" && builtins.pathExists symlink && (builtins.readFileType symlink == "directory" || builtins.readFileType symlink == "symlink");
secrets =
if !builtins.pathExists secretsDir
if !(builtins.pathExists secretsDir)
then { }
else lib.filterAttrs encryptedForThisMachine (builtins.readDir secretsDir);
in
builtins.mapAttrs
(name: _: {
sopsFile = config.clanCore.clanDir + "/sops/secrets/${name}/secret";
sopsFile = "${config.clanCore.clanDir}/sops/secrets/${name}/secret";
format = "binary";
})
secrets;