From 6a5faac11d77f1a3aef3214d04f64f593ac52e72 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Thu, 30 Nov 2023 18:38:31 +0100
Subject: feat(sterni/ingeborg): make secrets available

Change-Id: I2a39a6e5125e95c4ea10836694b594d068ceda73
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10178
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
---
 users/sterni/machines/ingeborg/default.nix |   2 ++
 users/sterni/secrets/minecraft-rcon.age    |  19 +++++++++++--------
 users/sterni/secrets/secrets.nix           |  11 ++++++-----
 users/sterni/secrets/warteraum-salt.age    | Bin 530 -> 685 bytes
 users/sterni/secrets/warteraum-tokens.age  |  20 +++++++++++---------
 5 files changed, 30 insertions(+), 22 deletions(-)

(limited to 'users')

diff --git a/users/sterni/machines/ingeborg/default.nix b/users/sterni/machines/ingeborg/default.nix
index 8784c3751587..311a4b8d3fc0 100644
--- a/users/sterni/machines/ingeborg/default.nix
+++ b/users/sterni/machines/ingeborg/default.nix
@@ -2,6 +2,8 @@
 
 {
   imports = [
+    # Third party modules
+    "${depot.third_party.agenix.src}/modules/age.nix"
     # Basic settings
     ../../modules/common.nix
     # These modules touch things related to booting (filesystems, initrd network…)
diff --git a/users/sterni/secrets/minecraft-rcon.age b/users/sterni/secrets/minecraft-rcon.age
index 7c896861b9d8..4d546764891a 100644
--- a/users/sterni/secrets/minecraft-rcon.age
+++ b/users/sterni/secrets/minecraft-rcon.age
@@ -1,9 +1,12 @@
 age-encryption.org/v1
--> ssh-ed25519 aXKGcg VELHhE9AlsAUspZj8M9zzOcjaml3/KSuNAae73TOOEk
-0vpPVz2TFMK2MLxHzMVO3a9QvnU9MfYcNO+JpMRRhN8
--> ssh-ed25519 34g70A 28ldud+S2mz83kcIkEGv5XWWOdXUN/vetsqho7kiCh4
-/P+hJqj9r3KEi0VD15yg0MHyy0XgYUU5/zpMRrLaysM
--> .-grease }}M
-ennsvHEhRup8I8R23GPWlILkCIMZmAuMT2F22SQPdjU
---- e6u1rsLXltysnQqp3x73HfHLhqzTfkIV3mXaCtW1cxE
-!NiA��O��4��P&�Ԏ�	��FF�����Rrz�����
\ No newline at end of file
+-> ssh-ed25519 aXKGcg GOH3LtzLreBjV2qMfbYqSTydeFe3moA8dHIkFndmlBY
+nCtgAiWujzv0jrjkL8hHOeBOHiAcqUi/8NgsKqdR8ZQ
+-> ssh-ed25519 34g70A xII2rIlNqf+LWLTeMhGMNjg0LVvoL7Ui85qahFxocXk
+8c8WrDfhWvHwf91y98GKJufEWwDdPbLl45ZOtygph7g
+-> ssh-ed25519 OaL1CA YNrzdmFNxdx9jxjhS4aLS81eykPFM9nx1JdBgJGzxj0
+Xu9jfvZxFf4pjksKHfFgFfujIBK8wfx+lO4ETdG7U4I
+-> EiWdsS6$-grease zxtU?v1
+JY//K9SibZZd0YHkB9HIBibhTM7tuK7EZ1Svi9Vl0t0kUiCPmZ93nEK1ORLOScDX
+I7BWEdk6aarK
+--- EqG+3UW7kN33+kxYo62sADBhPP3nZRzeFu8XCTUXfWI
+���`I"��?~��o��l�o6�~���]:pv�5���
\ No newline at end of file
diff --git a/users/sterni/secrets/secrets.nix b/users/sterni/secrets/secrets.nix
index d2f4860ff241..b1771a90231d 100644
--- a/users/sterni/secrets/secrets.nix
+++ b/users/sterni/secrets/secrets.nix
@@ -3,13 +3,14 @@ let
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJk+KvgvI2oJTppMASNUfMcMkA2G5ZNt+HnWDzaXKLlo"
   ];
 
-  edwin = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+OZ8f++cnvd4E2kFyn9jEoVpxi7LfjRvyQwzE8a5Ll"
+  ingeborg = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+OZ8f++cnvd4E2kFyn9jEoVpxi7LfjRvyQwzE8a5Ll" # edwin (legacy)
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAHQn/j6NCYucpM7qIEIslVJxiFeUEKa0hi+HobTz/12"
   ];
 in
 
 {
-  "warteraum-salt.age".publicKeys = nonremote ++ edwin;
-  "warteraum-tokens.age".publicKeys = nonremote ++ edwin;
-  "minecraft-rcon.age".publicKeys = nonremote ++ edwin;
+  "warteraum-salt.age".publicKeys = nonremote ++ ingeborg;
+  "warteraum-tokens.age".publicKeys = nonremote ++ ingeborg;
+  "minecraft-rcon.age".publicKeys = nonremote ++ ingeborg;
 }
diff --git a/users/sterni/secrets/warteraum-salt.age b/users/sterni/secrets/warteraum-salt.age
index f932a881cd43..05b6617f61a7 100644
Binary files a/users/sterni/secrets/warteraum-salt.age and b/users/sterni/secrets/warteraum-salt.age differ
diff --git a/users/sterni/secrets/warteraum-tokens.age b/users/sterni/secrets/warteraum-tokens.age
index 37ab46981ecb..568c34e7ac47 100644
--- a/users/sterni/secrets/warteraum-tokens.age
+++ b/users/sterni/secrets/warteraum-tokens.age
@@ -1,10 +1,12 @@
 age-encryption.org/v1
--> ssh-ed25519 aXKGcg yHE1bla5BN1Kgows1tdeswamJQHfzGpv8fL3qZs04k0
-rR1O25EIQXctnyVsQCZO47bM44KFhmOZ7ePiecKrZ40
--> ssh-ed25519 34g70A voVJDU9DIrT0z6X/mAi0tQqXthRZAyrzsPXOTIIzKUw
-yEiIaD9jblO44/RaoiPA0mjvRToNc4Ur9GcwfG9TSVo
--> =UOH^-Z4-grease Do<;So
-l0F72v4UD8r5kbpNIT2i1IUT6ttXZhuPE91H2tucMc5TKRvGDvpdJNpQ+P+XmX2M
-661iYooyust5TGZsXJFHVYg
---- To85A7ohH2Sjfy8js2+JzV0c86dmDO2JCH8TK7OtVtM
-��V�q�%n!�M#`3���;1
���wF��C��H'��Y������]�-���Q1������m
\ No newline at end of file
+-> ssh-ed25519 aXKGcg OapjTRkL85NyZj+IgTo0u7we79lx/e7l1J/nCb9TC1I
+zrRH/QsYkt9xbl/Z1sPsjBMQSny/0nH8/eKH14BFkP4
+-> ssh-ed25519 34g70A 96c4EnyB6vcaM45zYUmmeLjs1wmFnTlarAGXuacLcQ0
+vY0tm3Hp+qEy2YEXhGhrBO9lMqyeGAH5Zf2+mwgcOnE
+-> ssh-ed25519 OaL1CA ZACEEnZt8WwtEGHNu5ytiH49QPoLAM/8yYMdaae5WU0
+M7W9Fd0an0ttB/OWOfThGoMzw1jrWbFGV8jYvHzFXXI
+-> M:LfD-R4-grease 8 `} fnE
+XI6ltL2Npf5n0bpRgiMRyG7snTnZYHpLwHvGxPP3OicqSF+Eo1oWRibFe07Xhu8w
+NoSkbThM3IgxQFBdDg
+--- BxnnZ4l8AZNvU2CoExyPtFzqFT8JFMqqCZlmx9wyOTM
+HmX� �Og�ӯ�'�lː��ς�o,�;����DN��X�4ˉ%ɢ���B���T�qy!F
\ No newline at end of file
-- 
cgit 1.4.1