From a123b9e0a2a575816bab5b717a1d62b1966ac0a2 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 10 Dec 2021 10:24:49 +0300 Subject: [PATCH] refactor(ops): Move owothia secret into agenix Relates to b/161 Change-Id: I25445281b0dd3c3f3660f8bb0d8337506a1e427b --- ops/machines/whitby/default.nix | 1 + ops/modules/owothia.nix | 2 +- ops/secrets/owothia.age | Bin 0 -> 427 bytes ops/secrets/secrets.nix | 3 ++- 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 ops/secrets/owothia.age diff --git a/ops/machines/whitby/default.nix b/ops/machines/whitby/default.nix index 1f146c923..d6d3004ff 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"; + owothia.file = secretFile "owothia"; }; # Automatically collect garbage from the Nix store. diff --git a/ops/modules/owothia.nix b/ops/modules/owothia.nix index 909481873..b2a77cddc 100644 --- a/ops/modules/owothia.nix +++ b/ops/modules/owothia.nix @@ -11,7 +11,7 @@ in { secretsFile = lib.mkOption { type = lib.types.str; description = "File path from which systemd should read secrets"; - default = "/etc/secrets/owothia"; + default = "/run/agenix/owothia"; }; owoChance = lib.mkOption { diff --git a/ops/secrets/owothia.age b/ops/secrets/owothia.age new file mode 100644 index 0000000000000000000000000000000000000000..57a00504c8f3b61dae32fbe192d6cb517efc5c5a GIT binary patch literal 427 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCSnNiI(GDOd2(Hq1*( z$<6U9F89uh(9SK)_AyBhPc`$m2uTmB3^$C-w=Bv}^Yk@x%jfd8DD(@maE>ZW&Z^MP z$qjaOH4Sz$F*7bm4fHbcbMz_HcPY;?DfdavE=IS_Kij>~Ctbna%-PV{+dIrWMBhL= zxunV`qS9B}+b`U|+@dNdATP_$SKHm)-6JDByO_%{xuiHhr@+F@$GFNeCC5v@AUh>1 z*VxT9BrnxpzbGj)B*QG-*)+r=G8<%@nyy_?h?A+lZhBE_VsWZMO0t5zt-G%;mw9-g zi?OGBeyO=vc6M;4cVe-&d$6%@h+(R4P+lOHuCA^^U{#`VhMA>na9VM)rGKS+P+(Y! zZ>6hSc}P{JuZ3$~g}!fLxMQ}nZ$Lhm+wql!=3B1Utbe&*YQxdu;4{WI-%kCQcI=O> zzF)tF5X1TR25aued227YB_bv5$@jA~oi$Uo;e_NQlM2BH6aAT22k-4x>NQ&Dwrkni Gd7l86rjxz^ literal 0 HcmV?d00001 diff --git a/ops/secrets/secrets.nix b/ops/secrets/secrets.nix index ef359cd1c..308893358 100644 --- a/ops/secrets/secrets.nix +++ b/ops/secrets/secrets.nix @@ -9,6 +9,7 @@ let default.publicKeys = tazjin ++ [ whitby ]; in { "besadii.age" = default; - "gerrit-queue.age" = default; "clbot.age" = default; + "gerrit-queue.age" = default; + "owothia.age" = default; }