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

Merge pull request 'sops: fix decrypte path on machine' (#1091) from fact_refactor2 into main

Browse Source
This commit is contained in:
clan-bot
2024-04-02 11:55:53 +00:00
parent b342e3f991 8b4dbc60b5
commit 69aa46a1d5
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nixosModules/clanCore/facts/secret/sops.nix
View File

@@ -46,6 +46,7 @@ in
clanCore.facts.secretModule = "clan_cli.facts.secret_modules.sops"; clanCore.facts.secretModule = "clan_cli.facts.secret_modules.sops";
clanCore.facts.secretUploadDirectory = lib.mkDefault "/var/lib/sops-nix"; clanCore.facts.secretUploadDirectory = lib.mkDefault "/var/lib/sops-nix";
sops.secrets = builtins.mapAttrs (name: _: { sops.secrets = builtins.mapAttrs (name: _: {
name = lib.strings.removePrefix "${config.networking.hostName}-" name;
sopsFile = config.clanCore.clanDir + "/sops/secrets/${name}/secret"; sopsFile = config.clanCore.clanDir + "/sops/secrets/${name}/secret";
format = "binary"; format = "binary";
}) secrets; }) secrets;

1
pkgs/clan-cli/clan_cli/machines/install.py
View File

@@ -40,7 +40,6 @@ def install_nixos(
"nixos-anywhere", "nixos-anywhere",
"-f", "-f",
f"{machine.flake}#{machine.name}", f"{machine.flake}#{machine.name}",
"-t",
"--no-reboot", "--no-reboot",
"--extra-files", "--extra-files",
str(tmpdir), str(tmpdir),