about summary refs log tree commit diff
path: root/ops
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-12-10T12·55+0300
committerclbot <clbot@tvl.fyi>2021-12-10T19·31+0000
commitb1108821a9dbc617f02a4437c9300f5b0bdca479 (patch)
treeaaf699ef17aca6fc6b027a7f3fe925137eb65b4c /ops
parent1b94d2c0baee15baa03e805d6d64a3cf4d601f6a (diff)
refactor(ops): Move grafana secret into agenix r/3197
Change-Id: Id141758135c796881e91d20b950dae74c40d9ab3
Diffstat (limited to 'ops')
-rw-r--r--ops/machines/whitby/default.nix3
-rw-r--r--ops/secrets/grafana.agebin0 -> 529 bytes
-rw-r--r--ops/secrets/secrets.nix1
3 files changed, 3 insertions, 1 deletions
diff --git a/ops/machines/whitby/default.nix b/ops/machines/whitby/default.nix
index 41b53fa98445..88c0aa9d03c4 100644
--- a/ops/machines/whitby/default.nix
+++ b/ops/machines/whitby/default.nix
@@ -209,6 +209,7 @@ in {
     in {
       clbot.file = secretFile "clbot";
       gerrit-queue.file = secretFile "gerrit-queue";
+      grafana.file = secretFile "grafana";
       irccat.file = secretFile "irccat";
       owothia.file = secretFile "owothia";
 
@@ -517,7 +518,7 @@ in {
     };
   };
   # Contains GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET.
-  systemd.services.grafana.serviceConfig.EnvironmentFile = "/etc/secrets/grafana";
+  systemd.services.grafana.serviceConfig.EnvironmentFile = "/run/agenix/grafana";
 
   security.sudo.extraRules = [
     {
diff --git a/ops/secrets/grafana.age b/ops/secrets/grafana.age
new file mode 100644
index 000000000000..197fe9485607
--- /dev/null
+++ b/ops/secrets/grafana.age
Binary files differdiff --git a/ops/secrets/secrets.nix b/ops/secrets/secrets.nix
index 75cc80cc9137..66176c3b9ef3 100644
--- a/ops/secrets/secrets.nix
+++ b/ops/secrets/secrets.nix
@@ -17,6 +17,7 @@ in {
   "clbot-ssh.age" = default;
   "clbot.age" = default;
   "gerrit-queue.age" = default;
+  "grafana.age" = default;
   "irccat.age" = default;
   "owothia.age" = default;
 }