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

different fix for missing secrets

Browse Source
This commit is contained in:
Jörg Thalheim 2023-09-03 14:04:18 +02:00
parent f1e8070412
commit cfec69fec4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,12 +6,12 @@
let
machinesDirs =
if builtins.pathExists "${directory}/machines"
then builtins.readDir "${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")
then builtins.fromJSON (builtins.readFile directory + /machines/${machineName}/settings.json)
else { };
nixosConfigurations = lib.mapAttrs

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

@ -59,7 +59,7 @@
in
builtins.mapAttrs
(name: _: {
sopsFile = "${config.clanCore.clanDir}/sops/secrets/${name}/secret";
sopsFile = config.clanCore.clanDir + "/sops/secrets/${name}/secret";
format = "binary";
})
secrets;