Luis/nextjs-python-web-template
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
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 let
machinesDirs = machinesDirs =
if builtins.pathExists "${directory}/machines" if builtins.pathExists "${directory}/machines"
then builtins.readDir "${directory}/machines" then builtins.readDir directory + /machines
else { }; else { };
machineSettings = machineName: machineSettings = machineName:
if builtins.pathExists "${directory}/machines/${machineName}/settings.json" 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 { }; else { };
nixosConfigurations = lib.mapAttrs nixosConfigurations = lib.mapAttrs

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

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