diff options
| author | sterni <sternenseemann@systemli.org> | 2022-05-22T21·51+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2022-05-25T15·00+0000 |
| commit | 03d198631645ba3013e6e16bdf26a327cd51ccf7 (patch) | |
| tree | a184cbd1287f5269068a43b76892b34b3deb5154 /users | |
| parent | c55f61cd9b000607edd03c99c94c283fd968c4a6 (diff) | |
feat(3p/agenix): update to 2022-05-16 and add to niv r/4112
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>
Diffstat (limited to 'users')
| -rw-r--r-- | users/grfn/bbbg/module.nix | 4 | ||||
| -rw-r--r-- | users/grfn/system/system/machines/mugwump.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/users/grfn/bbbg/module.nix b/users/grfn/bbbg/module.nix index 7a49f7934a..70bb2c77e4 100644 --- a/users/grfn/bbbg/module.nix +++ b/users/grfn/bbbg/module.nix @@ -64,7 +64,7 @@ in serviceConfig = { DynamicUser = true; Restart = "always"; - EnvironmentFile = "/run/agenix/bbbg"; + EnvironmentFile = config.age.secretsDir + "/bbbg"; }; environment = { @@ -88,7 +88,7 @@ in serviceConfig = { Type = "oneshot"; - EnvironmentFile = "/run/agenix/bbbg"; + EnvironmentFile = config.age.secretsDir + "/bbbg"; }; environment = { diff --git a/users/grfn/system/system/machines/mugwump.nix b/users/grfn/system/system/machines/mugwump.nix index c5b60284d4..05b78ce517 100644 --- a/users/grfn/system/system/machines/mugwump.nix +++ b/users/grfn/system/system/machines/mugwump.nix @@ -153,7 +153,7 @@ with lib; zone = "gws.fyi"; protocol = "cloudflare"; username = "root@gws.fyi"; - passwordFile = "/run/agenix/ddclient-password"; + passwordFile = config.age.secretsDir + "/ddclient-password"; quiet = true; }; @@ -161,7 +161,7 @@ with lib; security.acme.certs."metrics.gws.fyi" = { dnsProvider = "cloudflare"; - credentialsFile = "/run/agenix/cloudflare"; + credentialsFile = config.age.secretsDir + "/cloudflare"; webroot = mkForce null; }; @@ -272,8 +272,8 @@ with lib; value = { inherit name; enable = true; - tokenPath = "/run/agenix/buildkite-token"; - privateSshKeyPath = "/run/agenix/buildkite-ssh-key"; + tokenPath = config.age.secretsDir + "/buildkite-token"; + privateSshKeyPath = config.age.secretsDir + "/buildkite-ssh-key"; runtimePackages = with pkgs; [ docker nix |