From 90bd9217e3c0f50e6ff12df8f540a21132d76c0b Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 19 Feb 2025 11:36:08 +0100 Subject: [PATCH] vars fs: fix --- nixosModules/clanCore/vars/default.nix | 1 + nixosModules/clanCore/vars/settings-opts.nix | 1 + pkgs/clan-cli/clan_cli/vars/secret_modules/fs.py | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nixosModules/clanCore/vars/default.nix b/nixosModules/clanCore/vars/default.nix index c9e04dd7a..c5ac0f41e 100644 --- a/nixosModules/clanCore/vars/default.nix +++ b/nixosModules/clanCore/vars/default.nix @@ -16,6 +16,7 @@ in { imports = [ ./public/in_repo.nix + ./secret/fs.nix ./secret/password-store.nix ./secret/sops ./secret/vm.nix diff --git a/nixosModules/clanCore/vars/settings-opts.nix b/nixosModules/clanCore/vars/settings-opts.nix index 49e65a7aa..276da4e9e 100644 --- a/nixosModules/clanCore/vars/settings-opts.nix +++ b/nixosModules/clanCore/vars/settings-opts.nix @@ -5,6 +5,7 @@ "sops" "password-store" "vm" + "fs" "custom" ]; default = "sops"; diff --git a/pkgs/clan-cli/clan_cli/vars/secret_modules/fs.py b/pkgs/clan-cli/clan_cli/vars/secret_modules/fs.py index b4a57d204..198c275ff 100644 --- a/pkgs/clan-cli/clan_cli/vars/secret_modules/fs.py +++ b/pkgs/clan-cli/clan_cli/vars/secret_modules/fs.py @@ -1,4 +1,5 @@ import shutil +import tempfile from pathlib import Path from clan_cli.machines.machines import Machine @@ -13,7 +14,7 @@ class SecretStore(StoreBase): def __init__(self, machine: Machine) -> None: self.machine = machine - self.dir = Path("/run/secrets") + self.dir = Path(tempfile.gettempdir()) / "clan_secrets" self.dir.mkdir(parents=True, exist_ok=True) @property @@ -42,6 +43,7 @@ class SecretStore(StoreBase): if output_dir.exists(): shutil.rmtree(output_dir) shutil.copytree(self.dir, output_dir) + shutil.rmtree(self.dir) def upload(self, phases: list[str]) -> None: msg = "Cannot upload secrets with FS backend"