feat(3p/agenix): update to 2022-05-16 and add to niv
The new version brings the new secretsDir setting which means we no longer have to hardcode /run/agenix everywhere. Change-Id: I4b579d7233d315a780d7671869d5d06722d769fa Reviewed-on: https://cl.tvl.fyi/c/depot/+/5646 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: grfn <grfn@gws.fyi> Autosubmit: sterni <sternenseemann@systemli.org>
This commit is contained in:
parent
c55f61cd9b
commit
03d1986316
13 changed files with 33 additions and 25 deletions
|
|
@ -60,7 +60,7 @@ in
|
|||
secretsFile = mkOption {
|
||||
type = types.str;
|
||||
description = "EnvironmentFile from which to load secrets";
|
||||
default = "/run/agenix/clbot";
|
||||
default = config.age.secretsDir + "/clbot";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ in
|
|||
|
||||
secretsFile = with lib; mkOption {
|
||||
description = "Path to a systemd EnvironmentFile containing secrets";
|
||||
default = "/run/agenix/gerrit-queue";
|
||||
default = config.age.secretsDir + "/gerrit-queue";
|
||||
type = types.str;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ in
|
|||
secretsFile = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "Path to the secrets file to be merged";
|
||||
default = "/run/agenix/irccat";
|
||||
default = config.age.secretsDir + "/irccat";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ in
|
|||
secretsFile = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "EnvironmentFile from which to load secrets";
|
||||
default = "/run/agenix/oauth2_proxy";
|
||||
default = config.age.secretsDir + "/oauth2_proxy";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ in
|
|||
secretsFile = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "File path from which systemd should read secrets";
|
||||
default = "/run/agenix/owothia";
|
||||
default = config.age.secretsDir + "/owothia";
|
||||
};
|
||||
|
||||
owoChance = lib.mkOption {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ in
|
|||
by systemd's EnvironmentFile
|
||||
'';
|
||||
type = types.str;
|
||||
default = "/run/agenix/panettone";
|
||||
default = config.age.secretsDir + "/panettone";
|
||||
};
|
||||
|
||||
irccatHost = mkOption {
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ in
|
|||
|
||||
secretsFile = mkOption {
|
||||
type = types.str;
|
||||
default = "/run/agenix/smtprelay";
|
||||
default = config.age.secretsDir + "/smtprelay";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ in
|
|||
value = {
|
||||
inherit name;
|
||||
enable = true;
|
||||
tokenPath = "/run/agenix/buildkite-agent-token";
|
||||
tokenPath = config.age.secretsDir + "/buildkite-agent-token";
|
||||
hooks.post-command = "${buildkiteHooks}/bin/post-command";
|
||||
|
||||
runtimePackages = with pkgs; [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue