diff --git a/secrets.nix b/secrets.nix index 650cd17..48dba86 100644 --- a/secrets.nix +++ b/secrets.nix @@ -5,7 +5,8 @@ let motiejus = [motiejus_yk1 motiejus_yk2 motiejus_bk1]; hel1-a = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF6Wd2lKrpP2Gqul10obMo2dc1xKaaLv0I4FAnfIaFKu"; - systems = [hel1-a]; + vno1-oh2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHtYsaht57g2sp6UmLHqsCK+fHjiiZ0rmGceFmFt88pY"; + systems = [hel1-a vno1-oh2]; in { "secrets/hel1-a/borgbackup/password.age".publicKeys = [hel1-a] ++ motiejus; "secrets/hel1-a/postfix/sasl_passwd.age".publicKeys = [hel1-a] ++ motiejus; @@ -14,6 +15,6 @@ in { "secrets/hel1-a/synapse/registration_shared_secret.age".publicKeys = [hel1-a] ++ motiejus; "secrets/hel1-a/synapse/macaroon_secret_key.age".publicKeys = [hel1-a] ++ motiejus; - "secrets/motiejus_passwd_hash.age".publicKeys = [hel1-a] ++ motiejus; - "secrets/root_passwd_hash.age".publicKeys = [hel1-a] ++ motiejus; + "secrets/motiejus_passwd_hash.age".publicKeys = [hel1-a vno1-oh2] ++ motiejus; + "secrets/root_passwd_hash.age".publicKeys = [hel1-a vno1-oh2] ++ motiejus; } diff --git a/secrets/hel1-a/borgbackup/password.age b/secrets/hel1-a/borgbackup/password.age index c6fa180..ec7b942 100644 --- a/secrets/hel1-a/borgbackup/password.age +++ b/secrets/hel1-a/borgbackup/password.age @@ -1,13 +1,14 @@ age-encryption.org/v1 --> ssh-ed25519 vDjOfg 364C2os+n+Ql2jN/VGkAn/qGpDuv1Z3tlR8a7LD6PAo -brzOmjiJfHq/GhUs+Q+HduKPNry2/s5Az4fi3QHaQ6A --> X25519 41BIZvGJSE92whjPVIdMtZ2mrv+nYFR3fAX6Qnga6Fg -cAkPwGWiBO3uzHHlI9mA+BVioIJKnoLZRjvllfkbeJY --> piv-p256 +y2G/w ApIK4bPqVqhXyTv2QtApM/SwAwKrcB9euOuOXxOsGtW1 -EmPYaZRboONQOJr/T//a5unCgRYW3BVQ3g2ejtexQj8 --> piv-p256 jNqd3A Ak+73XGPLVb/5TcGB8w8HFPyFLnyvKHHVD6ND9ohJ2F/ -bvC8Uu3A9m6ZFBI7CzimK14GSdcPBrGmflBPePWpHlY --> (!/%-grease Bxza_u 0eL_gi*M v$Tr2Q -r7xxL43b6wPWEc4rp/bck9ooqIj3e183nvUbwOkBISeB9Yj5DfjcnPohBGyXM8k ---- VrBiKWQ+JMwANJxNjgYbIuMvRawFHnNEyAnyRCq8vX4 -/xf 7FRS#yrYV0K,h ق/t * \ No newline at end of file +-> ssh-ed25519 vDjOfg jXKd84hBLGshv+pBkasnRvAOR6zJOv9kqj3MFhNEfSc +PR634A9Br6c0NTSZUoq6HpHfbIkbZxCrx+QzdK0tnHo +-> X25519 EQxm5Y1GnCgOAxq/sWSksofOs4bqh5thYKchFE7AVlY +i0eqmFuXZ2VGMOHqS42vifcYXuBCTlF+Ckp6M2Dxrrc +-> piv-p256 +y2G/w AvNFDhoheGvhx1OPcsYjNiXgcE2IyzNxnQa5o92TOfo/ +ORGLR75OPtt5t3ZntdrmKeWNqcoOh9/9l9LPrbNd9/s +-> piv-p256 jNqd3A A0hKbEWxWIgzjqC5rPnQvI6C89vvp3Ejm5X3hoSmJwcV +nae0utik6loEuMbOUe7EZoWszJYMsA4aYIT1fBu7rmk +-> W3-grease Bi-\Y /Yn +vVlW417ifsv6IU8m3IZWxis +--- 4+ia3CXXOvu7hPj9GLiTnzqQWwNPc8osiIysKZl1ApI +y?sAEoFk'E2ά**Zc-qS +JI6u,D \ No newline at end of file diff --git a/secrets/hel1-a/postfix/sasl_passwd.age b/secrets/hel1-a/postfix/sasl_passwd.age index 32d612f..1aa8836 100644 Binary files a/secrets/hel1-a/postfix/sasl_passwd.age and b/secrets/hel1-a/postfix/sasl_passwd.age differ diff --git a/secrets/hel1-a/synapse/jakstys_lt_signing_key.age b/secrets/hel1-a/synapse/jakstys_lt_signing_key.age index 6fa494e..fa1f159 100644 Binary files a/secrets/hel1-a/synapse/jakstys_lt_signing_key.age and b/secrets/hel1-a/synapse/jakstys_lt_signing_key.age differ diff --git a/secrets/hel1-a/synapse/macaroon_secret_key.age b/secrets/hel1-a/synapse/macaroon_secret_key.age index 52f64b9..132f06b 100644 Binary files a/secrets/hel1-a/synapse/macaroon_secret_key.age and b/secrets/hel1-a/synapse/macaroon_secret_key.age differ diff --git a/secrets/hel1-a/synapse/registration_shared_secret.age b/secrets/hel1-a/synapse/registration_shared_secret.age index 02ca7dc..13d2047 100644 Binary files a/secrets/hel1-a/synapse/registration_shared_secret.age and b/secrets/hel1-a/synapse/registration_shared_secret.age differ diff --git a/secrets/hel1-a/turn/static_auth_secret.age b/secrets/hel1-a/turn/static_auth_secret.age index 773d646..af7b896 100644 --- a/secrets/hel1-a/turn/static_auth_secret.age +++ b/secrets/hel1-a/turn/static_auth_secret.age @@ -1,14 +1,14 @@ age-encryption.org/v1 --> ssh-ed25519 vDjOfg sssiHOBSAurbFuJ4qF/l0sYbzBGefkLLSEssQK/a2zM -//zfg58LEypmb8l8qNor4g1BwPyHY+qTKWV2T27bW08 --> X25519 SCePnzyA6LXuqk6R0jG3BIf8Ob7Dvq7N/JLsga50lEw -qkH63cU+OETgLLSKf/1/0BEbcgfmUGruZTyIcrrVUAE --> piv-p256 +y2G/w A/ZT7U+JXFoR3Y7sRkwXfW97g4U2UWsJWSKZMoZkXHKF -vLi2hp4urxD43Yij0EzEcJLFy8iwxNF2Zyjs4u+zJCM --> piv-p256 jNqd3A A4ZwZmNfClY2uexezHA6iDnoA4p2ytdcp+9MARGIbXnq -Xpf5gYsq9wKscXHgDTUtJr3IJ9P7yEHsec2d0UjbM4g --> :w2e_Y-grease qQ6Bzl 2Yc P 1QW>yU&* -3sKAkYimXCaUqRwR845ezZu+rxLU0AbSCLrHoSVC6C0ZkfJzMEzVDWuRYaS67mKw -EKFB8LAkMMb4ITwOVMYCVw43QTbFJDwsXbrxBSncrfHt ---- mOUW0xQCSaVszKC9HqG7p8qNjVyiKAXHgFZ2QzSYX0Q -nև*ǰDq^`+~@&*pYJ ssh-ed25519 vDjOfg DGeT72n4VsH43Ns9yEnxfgy/uYKynfQGUzAtDPf+2mU +LPe1Uwll/Ee//jfjz4jRryl0Fej3jyev6QnYAtcEGD4 +-> X25519 LYVUZF8IQa2pfNevLpSI26VfzRe4wlMy23FeTIH9eVQ +HYXSzjCz7aeMm2BzGrD96m0CbWjLH/XYskhMNYtbX4g +-> piv-p256 +y2G/w AqE+qszNsNVu365Jq5MwieKVzPG2rAYMrO1bOF2z7Wh/ +KUdsBS22jiqWPB+9PoNSugsOKRk5PnFacCoRI05dnRg +-> piv-p256 jNqd3A A+sbeoWSbRRLu2mtTWPX/DJHjB19j7T7TR33zP0tqK3M +WCsLFXjWeDBNEnBwITpjAQz2HJjcv46YFO9OSB/0psc +-> -.}!Z;^n-grease K +fpu7Uos5Lia2hiTlW0SixCdyJP4FXRmmeHP5ufJGbk6qy972vmOeacC4M6/6Ck6h +eex4qQEs2epkNf0tsYvfeA +--- b54YQan0Bm8INDPrhn8N9LIt41/yGKQ8HeStn2Wqf5Q +_b6!NP%Ep'pp,VȊe6E \ No newline at end of file diff --git a/secrets/motiejus_passwd_hash.age b/secrets/motiejus_passwd_hash.age index 38840aa..35c4464 100644 Binary files a/secrets/motiejus_passwd_hash.age and b/secrets/motiejus_passwd_hash.age differ diff --git a/secrets/root_passwd_hash.age b/secrets/root_passwd_hash.age index 9156821..2055dda 100644 Binary files a/secrets/root_passwd_hash.age and b/secrets/root_passwd_hash.age differ