diff --git a/secrets/borg-key.age b/secrets/borg-key.age index df2e71e1..5848be89 100644 Binary files a/secrets/borg-key.age and b/secrets/borg-key.age differ diff --git a/secrets/borg-password.age b/secrets/borg-password.age index cfae9e94..a1d10664 100644 Binary files a/secrets/borg-password.age and b/secrets/borg-password.age differ diff --git a/secrets/freshrss-dbpass.age b/secrets/freshrss-dbpass.age index 123814d5..c88234df 100644 --- a/secrets/freshrss-dbpass.age +++ b/secrets/freshrss-dbpass.age @@ -1,8 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 kgCrKA wILVHjLHNY2lAAWw6ENwYlRTRq6fWAO4ZHxd/BXDvg0 -DCIIBq++JSKzcFOJ51i0USitDOhK9R6NEsCilGlxKtA --> e-grease F -cN5lygYFvScErf/J4BAEJ5ZkimpxOUj9gj8jGZV6Cl/RMkUThxflOfxz/OOBOK3V -S/NBseDL2dg9XzIUY7k ---- IIXSaSol3agW8SNwdOqxoV8dTkwW1CWxgJ8R3Blr1Sw -SӰyQ>lV,yR5SgHPj`dK6پ"uz)L[W˄ʷK \ No newline at end of file +-> ssh-ed25519 6DaCrw 1dgmzBJiOecaCLSJz1nrw3iTF9G00gIQd5hY6HXZKUI +HVkZRyHiKJ2E/Wdgty/uMbPm6lNy9wgaGwe5EJcJ8jY +-> ssh-ed25519 kgCrKA aQiYpgMLe9uSw7NB89mt3Gpa29RqZGHfnZzsOV8DaiM +gcgFyaibNSL5/7ITddnryWFxOuCX22mtGY2e0uL8MEs +-> zWZg=\-grease GP#:NZ \CW2nnR/ /k +bMvg21MLLhnwNVSyNMvMZNT9MzyiT6UqLn3SJcxGtt3Eu9jcMAphAeGy7i+8pQbt +9MnCFZBN4JG+ZunMtSQWodmOqiHFV1vKGsjqQboMsjMo +--- glgRELYTsrSXv/SK/6RDso2FhnvfCT1TB3Ytz/AERPs +97l b,!.L_MC[QrZk s"Q+C$ثϫ͎"sR[ \ No newline at end of file diff --git a/secrets/gitea-dbpass.age b/secrets/gitea-dbpass.age index 28965819..aa77b0d8 100644 --- a/secrets/gitea-dbpass.age +++ b/secrets/gitea-dbpass.age @@ -1,8 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 kgCrKA /u5qYf6vYBVeJryLq2xvZHXk9LY2A8+ks/XV4C/fixw -HNLXInIHa2d/CZR8/OwwhfLurpEbxiXca8Ip3kp/EWg --> s9b#/i%D-grease -DtUrN1QNHQyj0mSiV9nAOBpjf1/3yxxV4E4Xxr0oR2kJa/VWvpIYzyReZdRpS5Xs -Qf0Rw1HB9OAMAQ04DuR6FVfGYaGm ---- WszM9cCBr4HW0I+HltsdXj/BCxUDMld4yAVzXVo1HLg -4EݾGT/CBrXYWfr|e5}P) \ No newline at end of file +-> ssh-ed25519 kgCrKA QpRQkobE13NxRH81V9tFP+HelBBp5KE2cTyOZIyKsVM +hw3pwAfiQeVRqNwITHCKx8u2/aBtwdB24FJdexUfMyc +-> ssh-ed25519 6DaCrw HjJO4lhmCmsRSD979Jva6UXIMCYqTzmkh7BX+GkbpiI +8SyOm3HR23KfA4pz/fL8dwbvpyXQJRE9ymLMs1lFCBs +-> P32-grease %>7>/d}- +mB3N3P/0E4+1zo1l/cqSmqNqGBaDw2RrH4RC11GfZEmadA +--- 2P5bd82ou+ey3DbL5QHZKQM13N4hqvmzS5D9eWkYw5o + f2GqӍ;f&aYG BB*Vzl \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 8180a160..5160f6b0 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -5,6 +5,7 @@ let mossnet = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAA0bsVbdQR6iWNLKIiID57A1+dVXC58Dtf5cSXg6/JF root@box"; lituus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH2lAb33LH3JNuOfBXt971u0tHe+NURFecQdfjwEj+C+ root@lituus"; helix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAKrL6IDHNnHmxi0q9nzu87NOyidPm3HpE7klU368lEf root@helix"; + helix2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK2G81z1E51ioJQGLHnTJEjgSdBqLM6mb72Z+0atE6Bf root@helix"; curve = [ system user ]; allUserKeys = [ system user mossnet ]; systemOnly = [ system mossnet lituus helix ]; @@ -14,21 +15,23 @@ in "fastmail.age".publicKeys = allUserKeys; "mossnet.age".publicKeys = allUserKeys; "curve-wg.age".publicKeys = curve; - "box-wg.age".publicKeys = [ mossnet ]; - "wallabag-password.age".publicKeys = [ mossnet ]; - "wallabag-secret.age".publicKeys = [ mossnet ]; "nullhex-smtp.age".publicKeys = systemOnly; - "borg-password.age".publicKeys = systemOnly; "borg-key.age".publicKeys = systemOnly; - "freshrss-dbpass.age".publicKeys = [ helix ]; + + "helix-wg.age".publicKeys = [ helix2 helix ]; + "freshrss-dbpass.age".publicKeys = [ helix2 helix ]; + "woodpecker-server-secrets.age".publicKeys = [ helix2 helix ]; + "gitea-dbpass.age".publicKeys = [ helix helix2 ]; + "synapse-config.age".publicKeys = [ lituus ]; "synapse-database-password.age".publicKeys = [ lituus ]; "sealight-mod-password.age".publicKeys = [ lituus ]; "telegram-matrix-env.age".publicKeys = [ lituus ]; "wallabag.age".publicKeys = [ mossnet ]; - "woodpecker-agent-secret.age".publicKeys = [ mossnet helix ]; - "woodpecker-server-secrets.age".publicKeys = [ helix ]; - "gitea-dbpass.age".publicKeys = [ helix ]; + "woodpecker-agent-secret.age".publicKeys = [ mossnet helix helix2 ]; + "box-wg.age".publicKeys = [ mossnet ]; + "wallabag-password.age".publicKeys = [ mossnet ]; + "wallabag-secret.age".publicKeys = [ mossnet ]; } diff --git a/secrets/woodpecker-agent-secret.age b/secrets/woodpecker-agent-secret.age index bce3ac9a..6d9b9611 100644 Binary files a/secrets/woodpecker-agent-secret.age and b/secrets/woodpecker-agent-secret.age differ diff --git a/secrets/woodpecker-server-secrets.age b/secrets/woodpecker-server-secrets.age index 48396ff0..3b2266bf 100644 Binary files a/secrets/woodpecker-server-secrets.age and b/secrets/woodpecker-server-secrets.age differ