secrets for fwminex

2023-09-15 13:23:52 +03:00
parent d57b2e5a1b
commit 6b3f073b5b
18 changed files with 100 additions and 97 deletions
--- a/data.nix
+++ b/data.nix
@@ -68,8 +68,8 @@ rec {
      publicIP = "168.119.184.134";
      jakstIP = "100.89.176.5";
    };
-    "fwmine.motiejus.jakst" = {
-      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPi4N6NhUjAwZNSbi/Eb9zliZtrCzNEHmKb4UGRsJqF";
+    "fwminex.motiejus.jakst" = {
+      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHlWSZ/H6DR5i5aCrlrEQLVF9MXNvls/pjlLPLaav3f+";
      jakstIP = "100.89.176.6";
    };
    "mxp10.motiejus.jakst" = {
@@ -100,7 +100,7 @@ rec {
      mHosts =
        attrVals [
          "mxp10.motiejus.jakst"
-          "fwmine.motiejus.jakst"
+          "fwminex.motiejus.jakst"
        ]
        hosts;
    in
--- a/flake.nix
+++ b/flake.nix
@@ -91,9 +91,9 @@
          nixos-hardware.nixosModules.framework-12th-gen-intel

          {
-            #age.secrets.motiejus-passwd-hash.file = ./secrets/motiejus_passwd_hash.age;
-            #age.secrets.root-passwd-hash.file = ./secrets/root_passwd_hash.age;
-            #age.secrets.sasl-passwd.file = ./secrets/postfix_sasl_passwd.age;
+            age.secrets.motiejus-passwd-hash.file = ./secrets/motiejus_passwd_hash.age;
+            age.secrets.root-passwd-hash.file = ./secrets/root_passwd_hash.age;
+            age.secrets.sasl-passwd.file = ./secrets/postfix_sasl_passwd.age;
          }
        ];

--- a/hosts/fwminex/configuration.nix
+++ b/hosts/fwminex/configuration.nix
@@ -55,10 +55,8 @@
      users = {
        devEnvironment = true;
        passwd = {
-          root.initialPassword = "live";
-          motiejus.initialPassword = "live";
-          #root.passwordFile = config.age.secrets.root-passwd-hash.path;
-          #motiejus.passwordFile = config.age.secrets.motiejus-passwd-hash.path;
+          root.passwordFile = config.age.secrets.root-passwd-hash.path;
+          motiejus.passwordFile = config.age.secrets.motiejus-passwd-hash.path;
        };
      };

@@ -89,13 +87,13 @@
        };
      };

-      #postfix = {
-      #  enable = true;
-      #  saslPasswdPath = config.age.secrets.sasl-passwd.path;
-      #};
+      postfix = {
+        enable = true;
+        saslPasswdPath = config.age.secrets.sasl-passwd.path;
+      };

      syncthing = {
-        enable = false;
+        enable = true;
        dataDir = "/home/motiejus/";
        user = "motiejus";
        group = "users";
--- a/secrets.nix
+++ b/secrets.nix
@@ -5,10 +5,11 @@ let
  motiejus_bk2 = "age14f39j0wx84n93lgqn6d9gcd3yhuwak6qwrxy8v83ydn7266uafts09ecva";
  motiejus = [motiejus_yk1 motiejus_yk2 motiejus_bk1];

+  fwminex = (import ./data.nix).hosts."fwminex.motiejus.jakst".publicKey;
  fra1-a = (import ./data.nix).hosts."fra1-a.servers.jakst".publicKey;
  vno1-oh2 = (import ./data.nix).hosts."vno1-oh2.servers.jakst".publicKey;
  vno3-rp3b = (import ./data.nix).hosts."vno3-rp3b.servers.jakst".publicKey;
-  systems = [fra1-a vno1-oh2 vno3-rp3b];
+  systems = [fra1-a vno1-oh2 vno3-rp3b fwminex];

  mk = auth: keyNames:
    builtins.listToAttrs (
--- a/secrets/fra1-a/zfs-passphrase.age
+++ b/secrets/fra1-a/zfs-passphrase.age
--- a/secrets/grafana.jakstys.lt/oidc.age
+++ b/secrets/grafana.jakstys.lt/oidc.age
--- a/secrets/headscale/oidc_client_secret2.age
+++ b/secrets/headscale/oidc_client_secret2.age
@@ -1,13 +1,13 @@
 age-encryption.org/v1
-> ssh-ed25519 gJrHQg QUyCG7UyHpSQGRymIXCIXcCJMSNJFw4X1FZ8jpF4BSc
-yloky9dqQzHcbL10eu9d0Oy5pD93vaj+OWaMaRM8xx8
-> X25519 Us0TUemT40fXEttl9oTE2yFEE3/ocXc5oAchMaVaYy8
-XW+F/xZ/dxRl6ZNaxJqW6tJKRsHmQUq+WrDClsC6BgA
-> piv-p256 +y2G/w A15v9PCUdNIbL7sXVWlnI+JKw4H5XmMPsZlSySsIDliR
-XH9t2VKQ0TQ8SaYZEFxwYaVlbXo1676bWzE9VldzLXM
-> piv-p256 jNqd3A A/AZE/HfAeHRBVWNLhRwct8fAa0nR9QDfI8bPbl/alE9
-9ocZi9FhFsYtFebxi4iNT4oVB9jbh1Cva+JzOGQTnmQ
-> 5sXM-grease `@ce3YQw @-nd!?t9 i@\\f
-w0AVQyLn9dmOETzs59kBjx5v+w
--- EOWg6hRKuU2oivAVT/QVn2zigF5n97wwAIevY7Ed9c8
-5<EFBFBD><1D>@<40><><EFBFBD><EFBFBD><EFBFBD>IP@<EFBFBD><EFBFBD>W<EFBFBD><EFBFBD><EFBFBD><03><>W<EFBFBD>5<EFBFBD>!<21>Hh<48><68>(Wmg<6D><67>`"yz<79><7A><EFBFBD>O!<21>ڌ<11><>@!0<><30><14>o<EFBFBD>i<EFBFBD>8<EFBFBD>y2|Y<>mJ<EFBFBD><EFBFBD>\<EFBFBD><EFBFBD>V9<EFBFBD><EFBFBD><EFBFBD><EFBFBD>U
+-> ssh-ed25519 gJrHQg 2TKvT9YFW22mbjANJjbKhCqPqKwYv3GZr1bSV0CzhgE
+NIyjdm9WT/8LQ0szyCRxIa9bzdUWohowm4m5dsU9bEI
+-> X25519 i5WclbqkJl23Jz8NVNJghCy9/XeTaEso0lHDG8S5KSg
+77TpPA2RypjHM5NLdUL196aLoGBbR03e/lt9KF2oZb8
+-> piv-p256 +y2G/w AgsIQjG6hywcA7x25G28mgET2lNStll3Fz3+7pdPsefy
+z+CH3RW7B0dzS0H5wyp00JR3mLL4TH7agCjXq0kpA4g
+-> piv-p256 jNqd3A A89LKrgTNHPRwgiUXwjH9VZbJwT7nQJtHsYajJAfNQgP
+Jj5mzevirEJzYAARaUn+5GNthDuWJvZbM2wz1ofS4ec
+-> ]2C@Q-grease T p%=
+nc2CE42g1ZEMFkMTVY+TdXZVE1Q/mjAiWiLvk/2DthKaMp39mveG
+--- dBdEiLvbitUOT0RWmdEK1yBmP3UpbD2BNzob09P/8u0
+@<14>Ή<EFBFBD><1F><>:ɭ8<C9AD><38><EFBFBD>B-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ɉ<EFBFBD>U<05><0E><05><><EFBFBD>k<>z<0F><1F>RR<><52>~><3E>^޵<>L;<3B><>B<EFBFBD><07><><1E><>W<EFBFBD>[<5B><>$<24>oJ<EFBFBD><EFBFBD>t<EFBFBD><EFBFBD><EFBFBD>-<2D><>W
--- a/secrets/letsencrypt/account.key.age
+++ b/secrets/letsencrypt/account.key.age
--- a/secrets/motiejus_passwd_hash.age
+++ b/secrets/motiejus_passwd_hash.age
@@ -1,17 +1,21 @@
 age-encryption.org/v1
-> ssh-ed25519 qDkIVA MiWAnA7Jm1J2NpMquMzWuqW2/ef2wj7rgr2NoQajumk
-4bCmDh0KDbtGA3wOcwTNnHsQE396FpbVTXt/xuaQnmg
-> ssh-ed25519 gJrHQg MfbksR6fGlzslM0+QKDdwsLUIF0Bir88wI4Dz80eIw4
-c7CWpZTIIoLtNzu/gy2mZ5fuvwmXiTurm4WxJjeJ5jo
-> ssh-ed25519 CBqt6Q yPoayTFlLkfAp8XzqxTLALDNFsahVvpYh42CPlA4dQQ
-1hDllNzSiE+/M3lNvj4VS+1t6fU/xtxcKg+F2dUYyNw
-> X25519 DAE2lfGT+4XeslfLObvQDNgeoKiO67nkKlkQOYcT7k4
-XTGvX1UooqbryKvSYJHsUzMiwvDQqXx6VvkwBx1hbpk
-> piv-p256 +y2G/w A9rS2PXWm/Q4X9gPo2Zdj0OK6ebGug55CDekhaovLx3I
-mQdCWRNWXTa6BRMIgfvL0b/c/90EkWnsb3YgHkxaoCg
-> piv-p256 jNqd3A A5CayVfhdwu/Jpgqv/aYerN0+S/+5DEgpVTM0C/gvp4g
-XzPLq/6a34Us5/NLc1xPsOsy5r4Sa916oLctdTEBrnE
-> &J)-0<Y)-grease
-RSkeqfBPp/L4NLn2Sq4Ff/y/R5gMmH28K1pLZQax2F1E9HROMfbTfWQrZ/8Q
--- Q2KdxhHcMgvgfRB/IKHdhS6kRxkkdiLgPkTUj0PFCl8
-<EFBFBD>2<EFBFBD>c<EFBFBD>j<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><01><><EFBFBD><EFBFBD>j;<3B>b<EFBFBD><62>kp<0F><><EFBFBD>e.hNoy<6F>]<5D><>~ё<>K<EFBFBD>v,<2C>[F<><46>|<7C>><3E>D<EFBFBD><44>Aa<41>r#<23><><EFBFBD>%<25><>׸S<>8<EFBFBD><38><EFBFBD><1F>g<EFBFBD>ā<EFBFBD>cc\<5C><><EFBFBD><EFBFBD><EFBFBD><02><><EFBFBD><EFBFBD><0F><>01\!<21>T<EFBFBD>q<EFBFBD><71>\1<><31><1C>Ao<41>c)<29><><EFBFBD>G<EFBFBD><47><EFBFBD>r<EFBFBD><72>
+-> ssh-ed25519 qDkIVA wdh6PCvCQP9iUHs4Zj1k93BWFrWkIJw+e69oVT5cuAk
+YoR/RWO+j5bDiO0Agn6EqZykwN4a7pOs6dIPrXVRCN8
+-> ssh-ed25519 gJrHQg E1Ya5nKTQzAU20bcgAKgTiKUU7+Gi2HXs+1gHEK1wGY
+u8AK33E6GHAK4r6fLCxReiW7ZfwfSNUyC7Thetc+i1k
+-> ssh-ed25519 CBqt6Q wzlSzFIB+GuX7uYkqIq3y3EHBSnkRruo5TDrvl58P1Y
+Nh82Zwo72AeigVtKMgUbpderYS1Hn1TF5MNy8hf/LzY
+-> ssh-ed25519 fqSa6A GGMNKDARX99Ob7LwiGPE2iAaiu1zFG2otEb50VWsGCI
+v3sxjuwGnQzlWofev64QuCuNuP9ShztlqvsPrg5XvH4
+-> X25519 +ZzYIcZHZiC4qfOfbuh6C8+i37Kl02D7KqSAPXVc4jQ
+3vOZ0eIeIax2RTY9uW6mPfFNpDyqEsh9FH8aV7KYUGU
+-> piv-p256 +y2G/w Azty3dGpGmc2Krl7p5aIzmxMQQ40LGU7gbEdVkh9mslX
+hnPuL2jXTVMWr3PYt9Nz07iDyvL2gw69i1R7UbxGTGQ
+-> piv-p256 jNqd3A ApPsEmKOID1zWurmrMoH1HOzCkGBFUUPjRr5RysZ9G9Y
+vzHYlllvowShpfiRZh5dpFfKI/9sPOvbIMykqnm+igM
+-> Eo-grease scx%Ti
+yD0cMx1oCUBudOWFxqfFGe2wnXXlQ5+wpgmmxwgZdat+szTW8mo4/4E5tt0qnHNb
+
+--- 2yOBXSb2xnCN4K1i9vfddj54I7/gOWMuNKk+KtpfSLQ
+_<><5F><EFBFBD>k]<5D><>[<5B><06>^<5E><><EFBFBD>R<EFBFBD><52>x<EFBFBD>y7<79><37>ȍhw<68><77><EFBFBD><EFBFBD><EFBFBD><EFBFBD><1F>
+R<EFBFBD>-,<2C><><EFBFBD>
--- a/secrets/postfix_sasl_passwd.age
+++ b/secrets/postfix_sasl_passwd.age
--- a/secrets/root_passwd_hash.age
+++ b/secrets/root_passwd_hash.age
--- a/secrets/synapse/jakstys_lt_signing_key.age
+++ b/secrets/synapse/jakstys_lt_signing_key.age
--- a/secrets/synapse/macaroon_secret_key.age
+++ b/secrets/synapse/macaroon_secret_key.age
--- a/secrets/synapse/registration_shared_secret.age
+++ b/secrets/synapse/registration_shared_secret.age
@@ -1,14 +1,14 @@
 age-encryption.org/v1
-> ssh-ed25519 gJrHQg uN3hZ/phpgxPNJcAsZUOocZQnCM0MRYmOiNK/pU3myQ
-s8SO5m+indXoeB56CrM4LQr9a/mWgTc9fWhW/ISvs3g
-> X25519 xH1GoA8r0SRzhsvAXEb4b/MMn+6WCHtNG3Z5ejaxGGE
-zEim+nRwFzZupMzZ4k/7zeoXKINfpOmh8FyZ4uk5vw0
-> piv-p256 +y2G/w AvIRRC/sS8GSa9gcvqaEHqISQfZf5ObchvKD0sqZzzzX
-UiPeHRJXYp1YrLCFju2Bt1vS/XOSMD9A+dLW3mmZtmQ
-> piv-p256 jNqd3A ApCSKFPEzcVpNkt0980JGHiSgMQuBMvkoybPXkut8/y2
-9FktUfFBHvyVDsc62xpzhCV4HE4HND8S9ZjmykI18AM
-> 8HK$~#][-grease XvVMh
-6ufall+7KJkDgQhfb6CiTr+4JuG78ye74wtF0etPtn0jb1JM8pe3EFjK3XGQeLFL
-Uf365tThSVPKidxxhgdYR/x3Ed4
--- JZXGGwohMVMTIu1eRCIZQkNt4+CTHhb5MOZt14i0TPw
-	<1B>;i[lNH<4E><15>*>[Uʘ<55>g|yh<79>]<5D><><EFBFBD><EFBFBD><EFBFBD><07><>=;<3B><><EFBFBD>>ؿr<D8BF><72><0B>C<7F>V;<3B>~<7E><><EFBFBD>A̜<><08><>i>T<><54>z<EFBFBD>7<EFBFBD><37><08>"aԷ<61>)<29><><EFBFBD>~<7E>c<EFBFBD>4<EFBFBD>
+-> ssh-ed25519 gJrHQg n2RrAUazmvuABfziy0IUN6UIzImaBA1Cw2rpncig8jU
+CVqY3fA44GlG4An4B0SReFv1EHSC8a/wOcgH1wHD7Kw
+-> X25519 N1NBCcLBubC8tHf1P9zvzBuA7G874takvPWZx+Bi/UA
+FJevsBKasReD2qFayHhf+zND/lsHQHHEwFHwHDcK5vo
+-> piv-p256 +y2G/w A0t7ehcvv5cooi2vWnsaJdsv7MVkWePXurnaXCO7ABZt
+O6vYNfVN39U20j3sCQP9JUhokKwjlYgJKOUk+KDQdvM
+-> piv-p256 jNqd3A AxU6iRrF4nvTV0WSkwPR6c2hf7j9LdXJ1ATTiWjApw0m
+2CFdZi24wbTyDi53yZ6LMp9p2eEzk1HwmW06F+db/s8
+-> ?}=-grease DAqfF "&G)Ah*
+
+--- UrjHh71PsfS64Bsno5SSmnclnCb2u59pMcXA+4AhKLw
+<EFBFBD><EFBFBD>e<EFBFBD>_sav<EFBFBD>>g.<2E><02><><EFBFBD>e<EFBFBD><18><03><><13>6<EFBFBD>yOJsg
+<EFBFBD><<05>8-	*<2A><><EFBFBD>c<>̡<EFBFBD><CCA1>Q<EFBFBD>c)<1A> <07>;D<><44><1E><><EFBFBD>b<EFBFBD>4<EFBFBD><34>Wb:R<q~<7E><>v <20><><0B><1E><EFBFBD>
--- a/secrets/vaultwarden/secrets.env.age
+++ b/secrets/vaultwarden/secrets.env.age
@@ -1,15 +1,16 @@
 age-encryption.org/v1
-> ssh-ed25519 gJrHQg 5THt7akv4SIprRtXwsJjai0KCIy68qesO3THVmPH6U4
-QkEoBt2DMwuO/5O2rBjiyP61I+UfL1NYIybmxrBSs54
-> X25519 6cCxUYuBXKKZTe5ol+gWPCIUEb90OaeBHx4Ao8TdvSg
-IAu/+sSCRd11MMLX7gg0IfokFg5/gBhr8uq0TQTl1TY
-> piv-p256 +y2G/w AuCxXbmrgskiK3JZMRA0KdsGI+i5ji25WfvGSXRk2Uew
-5HthwgSDbYijdO0d5XuU3VXaJdo/s5nFrbYkRn9FPlc
-> piv-p256 jNqd3A A+u4AemQvx+4VaDOVfQVK1QwVow4wtL338tR3wtfetY+
-ps/PccVFGOiMKRrU6Qe66tQx7848PtZ1uSgn8D3v+Oc
-> 5%A-grease T
-pIi8blhc5OIffZGjkIT/0cIr3BMUClGz3r20O38Hj1GTVz/ayTAPFlsIVxzYyB8j
-tT9ZKPCOWSsRpR44GsYJ04Hmh2VC+VwBn2RNtg8xjMWHt7LviKIDnz+si+Q4SAUk
-xl1N
--- rDF0L0kHXOTEdv8gDn5rDbR6wvGJJK0PJpTmKbPLEaA
-<EFBFBD><EFBFBD>gK1<EFBFBD>|.<2E>z<EFBFBD>e<06><>)=er<>Z2a<32><61><EFBFBD><EFBFBD><EFBFBD>'YD<44><7F><EFBFBD>x<EFBFBD><78><EFBFBD>tQs<>&<26><04>`/<2F><><EFBFBD><EFBFBD><EFBFBD>ȃ<EFBFBD><10>϶<EFBFBD><CFB6>)<01>\<5C><><EFBFBD><EFBFBD>T+<2B>Y<EFBFBD>g<EFBFBD>s	Ǌ/,<2C>&<26><><EFBFBD><EFBFBD>[+<19>R<03><><EFBFBD><EFBFBD>N<18><>!<21>x<EFBFBD>G<EFBFBD><47><EFBFBD>%<25><19>OВ<4F><D092>$<24><><EFBFBD><EFBFBD><1D><>r<01>!<21>4Hk;գ0<11>ʴ<EFBFBD><CAB4><EFBFBD><EFBFBD><0C>Ok<4F><6B>3v<33><76><EFBFBD>,k+<2B><>9<EFBFBD>9n
+-> ssh-ed25519 gJrHQg rLYar9DbA6s+EVH/jrhTPDvOaishj5RJzrvuv+e720A
+X0SMSX/3S2slp6jQ/dTWEV/IK+7QbB80IT9CUOWDSCw
+-> X25519 L08Y9HJbjrvC9QYeul1yoFvAReBovysCyw9jcFDGYjU
+/EajqsG/eAM4cwbRpjuwGbH0WsC5L9qamTGlrlHNyTQ
+-> piv-p256 +y2G/w Ag6PbN/ydBsaslgk5YiQcctWCwFwrw5fcyYiMmsbJUX9
+QnseKal5us+3F+tDvoep6qG52VlMlka3dUT3fUARCOg
+-> piv-p256 jNqd3A AiT/seJKtb0kGOwKOl9uNfcj74HXnWSNQg/vSmXeHaQY
+2gyfVgG/ZuWaiQdsELyx76YsTw2UBIKSK1wynYqjubo
+-> 4Z1dhC-grease w17`
+ha525d105DMUgHQX6M9vo6YOAKpGq2367PKshPEhtyefqGmZD4qR1UDmJvL6KZ83
+B1AV+sEHvAD9wZiuc3tuaZQ5
+--- waVdCG6cViQ3PotSlcIS5vEtCSCaPXHyoZP3UQJjsEM
+I<><03><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>a!<21>Sw<><77>H<EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>gb<EFBFBD><EFBFBD><EFBFBD><EFBFBD><1C><>(<28><>bؕ<62>%7<><37><EFBFBD><EFBFBD><EFBFBD>YN4)t<>ed<65>NP<4E><50>{S<>,<2C><><EFBFBD><EFBFBD><EFBFBD>G)4G<0F>X<EFBFBD><58>=<19><><06>i<EFBFBD><69><EFBFBD>at<03>[<5B><>{<7B>)<29><> 1p<31><70><EFBFBD>G<EFBFBD><47>,<2C><><EFBFBD><EFBFBD><EFBFBD>k<EFBFBD>Au<41><75>5<35><11>t<><74>e<EFBFBD><65><EFBFBD><EFBFBD><EFBFBD>ѓ$<14><>b/<2F>T{C8<43><38><EFBFBD>V<03> <20>ޮ<EFBFBD><DEAE>߇<EFBFBD>ϳ&串<><EFA485>6<EFBFBD>v<EFBFBD><76><EFBFBD><19><><EFBFBD>r7.D<>
+<EFBFBD><0F>ڰ<EFBFBD><DAB0><EFBFBD>X<EFBFBD>=S<><53><EFBFBD><EFBFBD><EFBFBD>n<EFBFBD>2<EFBFBD>$.<2E>F<1C>]n<><6E><EFBFBD><EFBFBD><EFBFBD><1F>a<EFBFBD>Np<4E>f<EFBFBD><66>B<EFBFBD><42>&<26><>9<EFBFBD><39>Wʈ<CA88>&<26>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD>y<79>
--- a/secrets/vno1-oh2/borgbackup/password.age
+++ b/secrets/vno1-oh2/borgbackup/password.age
@@ -1,14 +1,14 @@
 age-encryption.org/v1
-> ssh-ed25519 gJrHQg +lc2/oTN8ne89hB9dw8pw+cUenoUqlmY26qBsgiqI0k
-k8UD83N5zlf7cVzcsOJTD21aqYjfhHsjSSLebww8ZQk
-> X25519 D8zHtY8xnFD6k5sj7o2psS8IyTGq0wIBxawWhstEGRE
-ebrS7iU3AoiAxcR/D5F/fJavs/2+CwB+1aWy/FP2bDA
-> piv-p256 +y2G/w A2zW22OcmmXNVmDtxPfw0uQEUqMvKNPFMqI1fLF3xBFI
-4cYo+xkL4yPJw2sVsciCTGsn44lJSOMEup9ogofU2U0
-> piv-p256 jNqd3A AtqHE2C+B3boEnoeXmJzOi6dugR/iwBzfn61ijKE9f/X
-hSyzdUoW+eZiimgSO/uEyfehaRs1t4/FJvTj6+lAQmE
-> 8?"TGQ3-grease zzERh$h^ +/ e;/
-XbwHD4n2UfT439uQ7izmALM45XWvCSmXREXFToZrwHFiMnuadxPXHJYv7Q49wDjA
-GBBOGX/bhQbC3dohYXxuAlr2Sxo0AcCPd52WHqohVi0UQBp+JK4c
--- Wdt/kT12nMqpamW5uZZAPyPnXFHrt6ftycnre5iZ2Ys
-<EFBFBD><1C><><EFBFBD>/1j<0B><>J<EFBFBD>{=q<><71><EFBFBD><EFBFBD>d.3J<EFBFBD><0F>x<EFBFBD>D<EFBFBD>#Z<><5A><EFBFBD><EFBFBD>)4<><34>*W<>
+-> ssh-ed25519 gJrHQg rKe07p70h/iFrB9SPq4cRo2nexzjZiU+Gx0S0RGn5xA
+iXN40fLa3/UZ+5KukzeImwbCPBCP2180PdPYPgteDMQ
+-> X25519 b3+Bg1PKLTmIp2X9+Xejh+1OXEV0Nb3DYTLAlOu79jc
+8HkST7iwBbIQ8SCjEuD/Vrg2yOnaGrNzlh7KNNol1jo
+-> piv-p256 +y2G/w AwVMn6wv37RMmcVasERArVyzcESTkaRXpjzarDE+kzPi
+9Ol9wRAvtEEup0osyBMU9A0WCtg33jkOVfJ4H0XxfzA
+-> piv-p256 jNqd3A AsYLQeTvjRW6xnSg2VVI8foqcjkIleW9EQ9CNS1ccM8v
+hDgzL17J60+0pzvvtjH4hbDm1WIJXncaJgj2iTrOBgU
+-> qMs|YE7I-grease Rr'\xV7 :.{8a! T0fC
+DU05IIClLkJVDM1GjtAFb3hsMACmbV9+v4YnW6vQ5MhHQUXUyujc+Bjv7ZsdZkJE
+HoM0NQniUvHRXCfndhcCfqoU96RCNr60rmW+AdhwUMrwhf1bFWU
+--- qqgdZHC7hmUCYmsJ6sbcILQanqOSlkceg2B/POSM2jk
+`<02><><14><><EFBFBD><EFBFBD><EFBFBD>x
--- a/secrets/vno1-oh2/zfs-passphrase.age
+++ b/secrets/vno1-oh2/zfs-passphrase.age
@@ -1,14 +1,13 @@
 age-encryption.org/v1
-> ssh-ed25519 qDkIVA xFVSyFREhLall1GtSiDdQ3329KFlmZldKQbtsiGQCSY
-QFe0EkUfrhqSRn9lizqJ6wBjo2bgm53nk/9+HroFeG4
-> X25519 gpwba+RR3q++dZWb4GRRi9EU48kn1hKRC4DMIDE+bRk
-cWU0shAt3vM6lEhQfOb3U/ShdTqiFba4dK0DLU/Q7x0
-> piv-p256 +y2G/w A03Lqtb7TrcKwip/5rFWE+NfqnawpNQcYEWneb4dEIom
-4ofx8MGBiat3a7SqqXK8ulctUYOTHQTKb6Uz6vhvzFE
-> piv-p256 jNqd3A Aw62QX3eAuujrK5WzgMbPUJf5NtdYBqvRW9aVkQs40ib
-FBt4nI9aFL7Sg5w7cF25lUapfqkt6HENTY5Yi2nbd1k
-> hd&kMR-grease f V ]Yq5"3d X
-bB0oS+WnzXSNF+EDcWwk
--- lLdRBt81S2VBwJpQYxeTv8JpbHPJxSMgmAndPLCkafI
-
-<EFBFBD><EFBFBD>ƫ<EFBFBD><EFBFBD><0E>fZ<66><5A><EFBFBD>Ҟ<EFBFBD>Q<><51>;<3B>2'<27>tvZ<76>W<EFBFBD><57><EFBFBD><EFBFBD>o<EFBFBD><6F><EFBFBD>/'4i
+-> ssh-ed25519 qDkIVA r0ozV6n+aH+R1eCrG2qbIIeQpLHldzUoydzD9daTvC4
+3DY8MjGm8Juos3AKFC6ASbHrrV9CgVcExYZLFQ3+5Os
+-> X25519 4B8uuFlpmXj0BNJiddB4lrzFw232Z0mvSPPJIqhECDg
+z9XjqiYrCcgx7py7aX41HKYa7qBc4ICqlRYrA3B7eYk
+-> piv-p256 +y2G/w AiMAHNgPxaIgizpHs9IbTu7Y9Ycfks80j1mEkStFGAUz
+wD/LkNXi1L6kLCgouJsWE6cwsMK1pyfxXkBrEUOqElQ
+-> piv-p256 jNqd3A AwdMd7VxIkcQa27rn6w21E8G8cVFJKq2mLS5RX0LtzVI
+uLMciaCY46wGSgVaai8zf53+RPnRN9UnngbNA9WBOvc
+-> e&0fstD-grease KGAZ )\$ +`Z
+pJNv0a4mK+gyvQBSMV+LewAWWg
+--- 6o4EQN4gGx1wlv1GvyPVRLYL5cCRhbgmdeFbgaWy6KM
+JdRFc<EFBFBD>uV܎u<EFBFBD><EFBFBD><EFBFBD>ӊ<0E>M<EFBFBD>r7Օ	<09><>s=<3D>o
--- a/secrets/vno3-rp3b/datapool-passphrase.age
+++ b/secrets/vno3-rp3b/datapool-passphrase.age