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

Merge pull request 'cli vars password-store: fix file locations' (#2410) from lassulus/clan-core:vars-pass into main

Browse Source
This commit is contained in:
clan-bot
2024-11-14 11:13:12 +00:00
parent 40130640c1 faf0946c99
commit c7289d2c43
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixosModules/clanCore/vars/secret/password-store.nix
View File

@@ -4,7 +4,7 @@
lib.mkIf (config.clan.core.vars.settings.secretStore == "password-store") lib.mkIf (config.clan.core.vars.settings.secretStore == "password-store")
{ {
fileModule = file: { fileModule = file: {
path = lib.mkIf file.config.secret "${config.clan.core.password-store.targetDirectory}/${config.clan.core.machineName}-${file.config.generatorName}-${file.config.name}"; path = lib.mkIf file.config.secret "${config.clan.core.vars.settings.secretUploadDirectory}/vars/${file.config.generatorName}/${file.config.name}";
}; };
secretUploadDirectory = lib.mkDefault "/etc/secrets"; secretUploadDirectory = lib.mkDefault "/etc/secrets";
secretModule = "clan_cli.vars.secret_modules.password_store"; secretModule = "clan_cli.vars.secret_modules.password_store";

8
pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py
View File

@@ -142,13 +142,7 @@ class SecretStore(SecretStoreBase):
for secret_var in self.get_all(): for secret_var in self.get_all():
if not secret_var.deployed: if not secret_var.deployed:
continue continue
if secret_var.shared: output_file = output_dir / "vars" / secret_var.generator / secret_var.name
output_file = (
output_dir / "shared" / secret_var.generator / secret_var.name
)
else:
output_file = output_dir / secret_var.generator / secret_var.name
output_file.parent.mkdir(parents=True, exist_ok=True) output_file.parent.mkdir(parents=True, exist_ok=True)
with (output_file).open("wb") as f: with (output_file).open("wb") as f:
f.write( f.write(