about summary refs log tree commit diff
path: root/ops/modules
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-05-22T21·51+0200
committerclbot <clbot@tvl.fyi>2022-05-25T15·00+0000
commit03d198631645ba3013e6e16bdf26a327cd51ccf7 (patch)
treea184cbd1287f5269068a43b76892b34b3deb5154 /ops/modules
parentc55f61cd9b000607edd03c99c94c283fd968c4a6 (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 'ops/modules')
-rw-r--r--ops/modules/clbot.nix2
-rw-r--r--ops/modules/gerrit-queue.nix2
-rw-r--r--ops/modules/irccat.nix2
-rw-r--r--ops/modules/oauth2_proxy.nix2
-rw-r--r--ops/modules/owothia.nix2
-rw-r--r--ops/modules/panettone.nix2
-rw-r--r--ops/modules/smtprelay.nix2
-rw-r--r--ops/modules/tvl-buildkite.nix2
8 files changed, 8 insertions, 8 deletions
diff --git a/ops/modules/clbot.nix b/ops/modules/clbot.nix
index 958d321f81ad..84575ed07203 100644
--- a/ops/modules/clbot.nix
+++ b/ops/modules/clbot.nix
@@ -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";
     };
   };
 
diff --git a/ops/modules/gerrit-queue.nix b/ops/modules/gerrit-queue.nix
index 66d584cc3361..4468bcf1c5f9 100644
--- a/ops/modules/gerrit-queue.nix
+++ b/ops/modules/gerrit-queue.nix
@@ -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;
     };
   };
diff --git a/ops/modules/irccat.nix b/ops/modules/irccat.nix
index 05a783fd6614..0819c52a8de7 100644
--- a/ops/modules/irccat.nix
+++ b/ops/modules/irccat.nix
@@ -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";
     };
   };
 
diff --git a/ops/modules/oauth2_proxy.nix b/ops/modules/oauth2_proxy.nix
index 58b3a222a80d..e92572365d52 100644
--- a/ops/modules/oauth2_proxy.nix
+++ b/ops/modules/oauth2_proxy.nix
@@ -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";
     };
   };
 
diff --git a/ops/modules/owothia.nix b/ops/modules/owothia.nix
index d11fdd26ecbc..b9746c172090 100644
--- a/ops/modules/owothia.nix
+++ b/ops/modules/owothia.nix
@@ -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 {
diff --git a/ops/modules/panettone.nix b/ops/modules/panettone.nix
index d57e53e75442..2576ab16c5bf 100644
--- a/ops/modules/panettone.nix
+++ b/ops/modules/panettone.nix
@@ -37,7 +37,7 @@ in
         by systemd's EnvironmentFile
       '';
       type = types.str;
-      default = "/run/agenix/panettone";
+      default = config.age.secretsDir + "/panettone";
     };
 
     irccatHost = mkOption {
diff --git a/ops/modules/smtprelay.nix b/ops/modules/smtprelay.nix
index cfb185ecd107..f6ce2621757d 100644
--- a/ops/modules/smtprelay.nix
+++ b/ops/modules/smtprelay.nix
@@ -40,7 +40,7 @@ in
 
     secretsFile = mkOption {
       type = types.str;
-      default = "/run/agenix/smtprelay";
+      default = config.age.secretsDir + "/smtprelay";
     };
   };
 
diff --git a/ops/modules/tvl-buildkite.nix b/ops/modules/tvl-buildkite.nix
index a6e7372a250a..c38687f80f71 100644
--- a/ops/modules/tvl-buildkite.nix
+++ b/ops/modules/tvl-buildkite.nix
@@ -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; [