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

Merge pull request 'vars password-store: fix secretLocation' (#2525) from lassulus/clan-core:fix-vars-pass into main

Browse Source
This commit is contained in:
clan-bot
2024-11-30 16:31:57 +00:00
parent 5a1be0e321 0afa050ca2
commit 99c83f8d9a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ in
] ]
'' ''
[ -e /run/current-system ] || echo setting up secrets... [ -e /run/current-system ] || echo setting up secrets...
${installSecretTarball}/bin/install-secret-tarball ${config.clan.password-store.secretTarballLocation}/secrets.tar.gz ${installSecretTarball}/bin/install-secret-tarball ${config.clan.password-store.secretLocation}/secrets.tar.gz
'' ''
// lib.optionalAttrs (config.system ? dryActivationScript) { // lib.optionalAttrs (config.system ? dryActivationScript) {
supportsDryActivation = true; supportsDryActivation = true;
@@ -96,7 +96,7 @@ in
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = [ ExecStart = [
"${installSecretTarball}/bin/install-secret-tarball ${config.clan.password-store.secretTarballLocation}/secrets.tar.gz" "${installSecretTarball}/bin/install-secret-tarball ${config.clan.password-store.secretLocation}/secrets.tar.gz"
]; ];
RemainAfterExit = true; RemainAfterExit = true;
}; };