mail: Migrate to marabethia

machines/lasting-integrity/default.nix

@@ -36,19 +36,12 @@
             fast = true;
             location = "192.168.0.1";
           }
-          {
-            path = "zdata/big-apps/mail";
-            remotePath = "zdata/recv/lasting-integrity/big-apps/mail";
-            fast = true;
-            location = "192.168.0.1";
-          }
         ];
         rootDataset = "zroot/local/root";
         rootPool = "zroot";
       };
     };
     services = {
-      mail.enable = true;
       matrix.enable = true;
       nginx.hosts = [
         {
@@ -85,10 +78,4 @@
       ];
     };
   };
-  programs.msmtp.enable = false;
-  services.znapzend.zetup."zdata/big-apps/mail".destinations."marabethia.vanpetegem.me" = {
-    plan = "1day=>1hour,1week=>1day,4week=>1week,1year=>4week,10year=>1year";
-    host = "marabethia.vanpetegem.me";
-    dataset = "zroot/safe/services/mail";
-  };
 }

machines/marabethia/default.nix

@@ -65,6 +65,7 @@
     };
     services = {
       git.enable = true;
+      mail.enable = true;
       nextcloud.enable = true;
       nginx.hosts = [
         {
@@ -93,5 +94,6 @@
       ];
     };
   };
+  programs.msmtp.enable = false;
   services.postgresql.dataDir = lib.mkForce "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}";
 }

modules/nixos/services/mail/default.nix

@@ -15,7 +15,6 @@ in
       { path = "/var/lib/postfix"; type = "cache"; }
       { path = "/var/lib/redis-rspamd"; type = "cache"; }
       { path = "/var/lib/rspamd"; type = "cache"; }
-      { path = "/var/sieve"; type = "data"; }
     ];
     mailserver = {
       enable = true;
@@ -78,7 +77,7 @@ in
           aliases = [ "@estherdereys.be" ];
         };
       };
-      indexDir = "${config.chvp.cachePrefix}/var/lib/dovecot/indices";
+      indexDir = "/var/lib/dovecot/indices";
       fullTextSearch = {
         enable = false;
         memoryLimit = 4000;
@@ -127,12 +126,12 @@ in
         "spam@vuztc.ru"
         "mofos@theportalnetworks.com" # Someone registered my f-droid contact address on a porn site :(
       ];
-      mailDirectory = "${config.chvp.dataPrefix}/var/vmail";
+      mailDirectory = "/var/vmail";
       useFsLayout = false;
       certificateScheme = "manual";
       certificateFile = certFile;
       keyFile = keyFile;
-      dkimKeyDirectory = "${config.chvp.dataPrefix}/var/dkim";
+      dkimKeyDirectory = "/var/dkim";
     };
 
     services.dovecot2.sieve = {

secrets.nix

@@ -55,18 +55,18 @@ in
 
   "secrets/files/services/phone-push-url.age".publicKeys = hosts ++ users;
 
-  "secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age".publicKeys = [ lasting-integrity ] ++ users;
+  "secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age".publicKeys = [ marabethia ] ++ users;
-  "secrets/passwords/services/mail/git_at_chvp.be.age".publicKeys = [ lasting-integrity ] ++ users;
+  "secrets/passwords/services/mail/git_at_chvp.be.age".publicKeys = [ marabethia ] ++ users;
-  "secrets/passwords/services/mail/hallo_at_estherdereys.be.age".publicKeys = [ lasting-integrity ] ++ users;
+  "secrets/passwords/services/mail/hallo_at_estherdereys.be.age".publicKeys = [ marabethia ] ++ users;
-  "secrets/passwords/services/mail/hallo_at_robbe.be.age".publicKeys = [ lasting-integrity ] ++ users;
+  "secrets/passwords/services/mail/hallo_at_robbe.be.age".publicKeys = [ marabethia ] ++ users;
-  "secrets/passwords/services/mail/huis_at_vanpetegem.me.age".publicKeys = [ lasting-integrity ] ++ users;
+  "secrets/passwords/services/mail/huis_at_vanpetegem.me.age".publicKeys = [ marabethia ] ++ users;
-  "secrets/passwords/services/mail/info_at_eenstweedrie.be.age".publicKeys = [ lasting-integrity ] ++ users;
+  "secrets/passwords/services/mail/info_at_eenstweedrie.be.age".publicKeys = [ marabethia ] ++ users;
-  "secrets/passwords/services/mail/noreply_at_vanpetegem.me.age".publicKeys = [ lasting-integrity ] ++ users;
+  "secrets/passwords/services/mail/noreply_at_vanpetegem.me.age".publicKeys = [ marabethia ] ++ users;
-  "secrets/passwords/services/mail/peter_at_vanpetegem.me.age".publicKeys = [ lasting-integrity ] ++ users;
+  "secrets/passwords/services/mail/peter_at_vanpetegem.me.age".publicKeys = [ marabethia ] ++ users;
-  "secrets/passwords/services/mail/postbot_at_vanpetegem.be.age".publicKeys = [ lasting-integrity ] ++ users;
+  "secrets/passwords/services/mail/postbot_at_vanpetegem.be.age".publicKeys = [ marabethia ] ++ users;
-  "secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age".publicKeys = [ lasting-integrity ] ++ users;
+  "secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age".publicKeys = [ marabethia ] ++ users;
-  "secrets/passwords/services/mail/robbe_at_vanpetegem.be.age".publicKeys = [ lasting-integrity ] ++ users;
+  "secrets/passwords/services/mail/robbe_at_vanpetegem.be.age".publicKeys = [ marabethia ] ++ users;
-  "secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age".publicKeys = [ lasting-integrity ] ++ users;
+  "secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age".publicKeys = [ marabethia ] ++ users;
   "secrets/passwords/services/ssmtp-pass.age".publicKeys = nixosHosts ++ users;
 
   "secrets/passwords/services/acme.age".publicKeys = servers ++ users;
@@ -74,10 +74,6 @@ in
   "secrets/passwords/services/git/mail-password.age".publicKeys = [ marabethia ] ++ users;
   "secrets/passwords/services/git/token-file.age".publicKeys = [ elendel ] ++ users;
 
-  "secrets/passwords/services/grafana/smtp.age".publicKeys = [ lasting-integrity ] ++ users;
-  "secrets/passwords/services/grafana/admin-password.age".publicKeys = [ lasting-integrity ] ++ users;
-  "secrets/passwords/services/grafana/secret-key.age".publicKeys = [ lasting-integrity ] ++ users;
-
   "secrets/passwords/services/nextcloud-admin.age".publicKeys = [ marabethia ] ++ users;
 
   "secrets/passwords/services/data-basic-auth.age".publicKeys = [ urithiru ] ++ users;

secrets/files/wireguard/marabethia.privkey.age

@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 9+Fe5A oDCzVr39E9pEEFVtN6w9nG/CHD0FviDtpiiHfEZjTRg
+-> ssh-ed25519 9+Fe5A EsaEh8Rk3g8he0/Af4UeRXEJwfR8EaoPlnLavTFAElA
-70Jx/nw8oUEa/Rv26XioYKexI46PP6pUECIoabsVYJk
+69rxJgueku4nxwJFpLq4T0sPFBE77TatUd0m30Sc/68
--> ssh-ed25519 s9rb8g gQuJcpdUA4aFruQNbtJcYiQ3N7PkSfaC5FPpwzdu5HA
+-> ssh-ed25519 s9rb8g pSKXwiUB15NwudYxzHuU57GgSdQLlg5v3NkzGw3hSBA
-iQUFWXQdWi3YwSuO7q05zGCv9TLTUIJO9nfImeilSrs
+QRyuuBidE/ZhfRp78AeFkVKaEITzNMM4dB+jH1orD+0
--> ssh-ed25519 +xxExQ 7BEOA53BkRdfDYYtljw0vhqTM0Fe7JynKp90BXzYIQQ
+-> ssh-ed25519 +xxExQ IcEDfBjLD/cV5IoWeAtyox8kDxtMsuGJKk+Jy2S0JVQ
-H3PuMheUGbMRIdySOtlq22v/n2ga/Sk35zi4tujieuc
+K0upEhxLDJR5audxXIN+tcv7RoqckGoPAgoIMD6/PMM
---- KIgDAadignftw8CCoRYLE8p+53wO5yPAZSuN+KRMfdA
+--- sg/l9N6Y53ZdA7YCiKPtLRzCLvFtnyYVDtmY+DHwwSE
-—WQT  Ñ~úTÑ€N}ˆó—šz˜êa<C3AA>ù]CGMK¹óY‹0Èž°zN¹jèE<Ó”Ü8ÍžÄá 2]cÊÜ¢c:CzÙêÞ¿Ë]p
+×UŠ’¡hÓÛ%ˆhĘä×d‹oLŒ‡Ï`ˆ8e	<09>YôÇa0Ò†
übSWc7Ä`/’ÈTâ”
6ý#¿¥¢p§ånðÁèà'Ñ

secrets/files/wireguard/psk.age

@@ -1,19 +1,20 @@
 age-encryption.org/v1
--> ssh-ed25519 Lbmdyg ETGStr2S3Um1TbKn2u3yuy8W5dxoiZyhdl4bagTSTwc
+-> ssh-ed25519 Lbmdyg y0PHW2qc80037gHeLoGv3xQsbDtq1hafeQ+XfXDq+DE
-tdCO1OwA5iILeXDtjaW4lXqnlWGJGQjj7WQNaQLRSpw
+EhKOCBfpBv0nSNgrodggyjt5ieQLEoCn/NVFMpjn+F8
--> ssh-ed25519 aUd9Ng VFpg6WL/s1rkgzgtv1gA+8ARVrMPXyUxcKWSxPyqGWM
+-> ssh-ed25519 aUd9Ng fHC0sCNZC6G9hr7rbzt7fjw1oqWM57r3tSd6CCpuCHg
-2yOs1VI4oK3b4p/GhNaOcGPoZ1rkgpl2v+SaY5riedU
+YwY75l/fj8oc+IFu070pxEIooKzxlmP9KEW7T+kBp/c
--> ssh-ed25519 hKAFvQ e4ww3v675dp9szL7cnR5GKWKmhPu5lYy5oCywW1Hbmw
+-> ssh-ed25519 hKAFvQ RsPPPnQ4EW6tltxKIjiTDAF1+stjMPmpAnCR0hesXjs
-iNrz1mlPGrFQvrWHCaUSoBc+5O2I5xks8Jl0ITg5/Jw
+hNpRSv3fVkVEdLZ801ZCzBAahveGzkuEFXMCzKO+it4
--> ssh-ed25519 9+Fe5A QLjoEkPb8kDOzmC/P3HS8LZnupb0ZPBU43sZRDAZST8
+-> ssh-ed25519 9+Fe5A IRQqvxpOlLMJCkSXuk1PYCIiMsIDIsDtxx5indceXlA
-4vmp+t51X4lArJV54XLbDE425wGUuk7X1nUiUrq+7q4
+sk7nvBrBFq49LsgVrqyFy79braWWAveQUkeCKt0oGws
--> ssh-ed25519 KOkamg TrYEGGw8Mf4FhgK6pp19VR5Wh2JYUfVnCdiJkLzxnS0
+-> ssh-ed25519 KOkamg 0UsyKfZWoiGVLQfSYs2zXFd8VyHzrC+l4afjGbmeJXE
-CA5IzdLCoZ06DzU27dRWnM2cXCvqstAsaRYXnhVUF1E
+8mZEZxrrzPEBYRfQz9DjWVm/qX8t6xIVYMDf4JSAGPU
--> ssh-ed25519 9PfEBQ lxbCkcnNcb5ixislCL/11du++XMTBkfhPiz9TtS/7Vw
+-> ssh-ed25519 9PfEBQ rIuknd/x+nQCXlvAxhlyCrTv/2QCTmeu/k2aN+v0CXc
-PEnU5VBOMSHUEEX8dbQDASp3gyyKq6Wq5PCES18gQDI
+gekdCSzygefjKsiUPXyxywTMYW6kJUAyVwwSoNfMkOM
--> ssh-ed25519 s9rb8g fVNZvMSeIeL/HrecVJxq2lXZ0Jnrpgua8itIhhhbV0c
+-> ssh-ed25519 s9rb8g oPTtr3NozbMCeVjV6bj4vHTWW6vJOtDsx5nWeXSyAjc
-4uhBWt5KBCMR5g7alhRgGcF78eTFtJxBksVam1GjmXw
+MXNgnjlWJIEa/OCVFpCPh96BVhQh1/o9BSLeVCk75EU
--> ssh-ed25519 +xxExQ RxZbJdswGq5l8zI32vnXxrI3KmUCSMIkp0TMk02BZCc
+-> ssh-ed25519 +xxExQ TLwKJX/bAnYelpcFSNN8REgSB3I/fxEkad+95dVo2To
-uQaFBa3LMkuLiVPxKUo3xCaEmnj0q14bQAe4O8ta31E
+5v28cAufry5XlmhM0cxW+C+x6gtUrtzH3kciWe++Lf0
---- pAsH6pyQbciqkFxUU7oy1uin330MBmvb/F5m8/OMG9w
+--- dLgrrSuJoIS/q+Vuxn4QJDNLNxgFK9E/RWYtcbRz79k
-¢k`DÅ^X¯^NSú"€³Òæ`¨ë°Hüi&zñ¥>#ƒU}·
²Ñéy ö‘9« jrËW<C38B>ŸhÈ{Ínï2­³L•ø ãí§ÅÆÝ`o
+þçém£GüƒYÊ ~ÿÊ·²¿jÁIÞÝ
+{Ï	RöUw¡·B6¿”Pgõê}ˆ!û÷	¶´ETjßP\3/é½÷½|P²Ÿ£Xw

secrets/files/wireguard/thaylen-city.privkey.age

@@ -1,10 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 KOkamg wyWjHEqgJZCC8X4DMULXX5zJytk1d0UqMEOKYA9wJis
+-> ssh-ed25519 KOkamg ycsVX6qL5n3DSICalyKgqr8V8DGcDYE4qrKhB5VRKVo
-pXwF/jfjNEctrcFm7p4hWA1GPINjbneLIhcZ2iAK1BY
+c3bLsLwp1UlLtjf2eTUJHqfGZHmohvYZnjU91MYkKlM
--> ssh-ed25519 s9rb8g /0uoT0iAW2b/3sRSgVCZly5w4jr/FN8qLebBmspAEUk
+-> ssh-ed25519 s9rb8g FTQptebEEd2xR3hN6MFJVfy277Q+G78fHpvI9HR5GTU
-EGLNqenzcJIdzZCogZ7apynj+OzgP1oF/NVjbflk30c
+YViBufWD2WB7txk7slYDc/WCgemP2Fxb2Yk/YXoLp9o
--> ssh-ed25519 +xxExQ LW+vPPlXKUYoT3nFjXu5HbxXWoeioeL+zqUtwLyG3H4
+-> ssh-ed25519 +xxExQ aK7M3j7fdXUPPBHG6kzBd+LqMu/PlWxNbEjmKjj8a0w
-T5JS/UdSnj+F5dLuvvO3wlcMz1s/SJjRhlFJwNuzOQk
+Rf0Cjkskj0/sDfJ3ouQBRhmmj+7Hm9w3nNsoRg2pPZ8
---- zkVO4IFRhNEB7CigwZAaWxQnTC+yLSUtHQ3TN2LyoLQ
+--- akTPwWRcWEIgPHmmirrz3vFhJ94Kp71c8WYFqen4Y3s
-­f
+É(ЖÇy@Fb6¹ÄÝ<>ãÖEò†RFÌMÀ¿y×Wû&•Ä§¥®Cj[‹½7‹ÒB4úN•ù9"
f€“ÆÓ<»³‰ ò<>‘¹ ÌÎ?3
-èÆûò|R:†ø…DθZÏwæŸG·KÜ5bdÕ"—¡fƒ6¡Fz½Y¶çöï?ÔIrrðj´Ñ"!ý9,_$áÂÏq¯pl‘;Lw

secrets/files/wireguard/urithiru.privkey.age

@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 9PfEBQ 5BUPzmn/CWc0K37uePJ5aIRF4SlTOFescqODt5xlJiU
+-> ssh-ed25519 9PfEBQ 74N9hlQqd9oD8xWufftHEyDMeOiQJ/apEWEv2LRF5UI
-swgmU3/FvB8DO3rh8dZmkSwqXY+7MMTNPAJQDezK1Jg
+hhv45dE+YaDzc/x6yeVIHXdhi+Rigx8MpRnTtho7FME
--> ssh-ed25519 s9rb8g k+oBlyvq8a0TLT04u7Z8RLq02CXrZUvNaUGUk+0RWzU
+-> ssh-ed25519 s9rb8g mUG7y108r2E52qTq02eIX0De9SSVnKqlJqCbK/JT82g
-5gHf9Egld33N71KLw/N8Pw6eQZAl4mFhcb8hqqfzDTo
+2V6FDuJkevAzxlkxSAu92HReKkOVCM5p16aIZG5isUw
--> ssh-ed25519 +xxExQ eIyt0jnyNR1/1kNcv9bjL+2ZFde6SDvAJmYDd7HJHyQ
+-> ssh-ed25519 +xxExQ sgR2+A06k10fj6yXMTZVpPxEzjVIxxigDmZkwxeNQ0g
-RmWBHGUkD0zw+E4Mji86R5rfM3NYPpAjI3//NVTPhVk
+GFG6j4tiiJoBTM4uFnubGqroGCFgXbrZ7poBM1rFHtk
---- BI6d30LxDJgDtCIlMXs0GV1ILljmuZj30V85vTgX80A
+--- GkFm2oU04FpOZioNR3moloV5pt6/IfUzGq4/aHW/upk
-<EFBFBD>ãh+¾}&“_ó)í%©•1jÓý
9‘
ãFì#ä®Ó¡5!k±eœÈÍWRz¿¡”C].æÿA£¼ºI<C2BA>CÔ%p€&])3û
+pƒ+H6ŽMÈ›€×§<C397>~<7E>Y÷­æÓ‹ˆP	írM—<4D>›¤Oì˜ra†ÃS²¡z5ÊS?Õ"ïš}kzÞDnnÉÑ5E-œx<C593>U3næO¹÷

secrets/passwords/services/git/token-file.age

@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 Lbmdyg Kbh51OhLWGjT4OLtHurVk0vz11xsPpLPI4zl0jFqPh4
+-> ssh-ed25519 Lbmdyg cABXwN8uCvOQeIY2OfFpoL8EgaOoDdPkqt92m7mMSG4
-AcMTRQUVn0GZ1JXkoUljKXCiV7Nvstdcm7Y4zcpeUXM
+bEPTmKhs8okfFcyOSgB8XoH8ikt2vcgYzgsd7Matj54
--> ssh-ed25519 s9rb8g hbELwPWfeQ5bQRk+Cfk71nKKXklsXGH1nvYenCj+I28
+-> ssh-ed25519 s9rb8g zitGUHHflVnu1an2YmwP/QbqR/oeOpD0KfUNaWyHuFI
-mOwvavMV712JXzRwKLT0YyIg7taEnEy5EQk2dpcvHQs
+Cak/sV0D/GVzw6N+DWWDo+TMro7LW1wGiyQhgrvKZmg
--> ssh-ed25519 +xxExQ r1RJwMNxAna76oYSASFSvK1Iuqbi4QC00meyZaIQeE8
+-> ssh-ed25519 +xxExQ oYEAtj4hKxgfXomhl3u1EJ8Lwk+SqVq4NuXBJWqN31w
-WUFkwBn9dyvc3jOWUY4I1uNa0uyvH3UxhLO1Z+bAyfY
+EPKBeERdfSAr05bo2PqVpST6XDMPJU6DtkfDjmXSD4I
---- nuk1OWbKi7ODIes3U55b4LvkeRcupSVWdZA+auZ3iPU
+--- E0glwxFRUN8bccBmFIw3ga5zgjBa0SBQy6PLVkEV33w
-P}ž€ß‚~îÀ+k
#0ÊØâ^vaB™#È/xFø~¦<>«<EFBFBD>Z»NN1b6cùßbfQÃì‘HmNM	CüéDú£ÐE~†ÂÝà”
+’
LLÄïÄšY$òõ&è_(Ùô²õ½°ëõ|@<1F>+!{oÜ<>W’‚ÓÿÞËN3ÈNiäjIâž2® wtãa±§"1lÒ÷õ

secrets/passwords/services/mail/info_at_eenstweedrie.be.age

@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 hKAFvQ dBv9IzD/+9+uQLHV7grbTOwBII6SWPwweupKrKJM3kQ
+-> ssh-ed25519 9+Fe5A gCgx5GIc1ZjhvwWzzPJnTRk3605fNWoE5UieqyR0MU4
-G9d3hDUuhmP0164aE9IIycr2ThOI3NoBBuX6YwmLPaI
+tv2WUuO6gx8vzAnOo+YnfZ7uvzPgqRtOkKPy9Tt3Rb4
--> ssh-ed25519 s9rb8g yBqpyIUlTMHzz+7f251eT17vfLQRg3mlLfZt37NU2C8
+-> ssh-ed25519 s9rb8g BXfNxRkYSIWjMZt+xFvFgUxAQTxsWZYTwA5THqCMWx4
-oLj9MxGr3/6pwcVonDKeF9G7omwLhO9ZSgSdUJyP41E
+4EI2G6FipAtBXv6wCPc3lSXyH2nDl5Z9CzR+gtiQY/w
--> ssh-ed25519 +xxExQ 8eEcw5nIGcFg/NUYTRv6TFLUtLVDCkyxzYmfsXTFrFA
+-> ssh-ed25519 +xxExQ lzqxzFbaZ9KLcQBCE8hVWA/7icZokCW1AgZ3HCPNNF4
-yBKTSrpDDcSTVAa/Yd1GsZtUwhMYFLpw7J6LyjQBazI
+J8H3t6TbQBzcr2XycuXXwF3charX8jQKbV/qVNX+aqI
---- WQPV6rNpWuAl8NmKsmRJPFFTllPFg5pN3WuPJNeBdSY
+--- +ihzz+e8xwKeP8VSLUZsan1uphEtnGhRHUJD4VTS6Lc
-péeû± ,ñwµCû÷Ò–ZJª8<C2AA>PíWð˜Y¬ézØ$5s礤äß$ªþ%:ÍË[\Èlšær
úê—<C3AA>C©Õ:ðô$žèA!*Sçˆd¦<64>£!Èx<çÒG,
+ÂTÁÙ<{ø…‘)ºý_é	5ÁnZžÅl Ju`ŒöHTk<Ó2DvdDcäÒìÜšcMÞ3EðSÑDo=5Ú¥<C39A>>Hþwì:éÕ¡<C395>'Xs¡ãÍæ¬
8eõ¨

secrets/passwords/services/nextcloud-admin.age

@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 9+Fe5A ILh55bxXxHmxBAk2mWuyKZE5hDcqsieLA1dCX44uAjc
+-> ssh-ed25519 9+Fe5A qN+BpuvfwqUp4UdtVbcZmG4NhJC+pXfbztYISQiPdSc
-ELgpxtXLWAKLX370Rc1TR1dBBydqJWEanQSqnOBRIQU
+kKyPMgHE354AwJCcCxjtzk/s/M9G7xdh0/9eHxa/pMo
--> ssh-ed25519 s9rb8g MvtK5sA1//X78yBMwFyNxKjQtJcb8s1t/LU7YXUx0A8
+-> ssh-ed25519 s9rb8g MP7pWfzJ+UnJe5Lx4bRnxK6EJHLgeH2/mWAh2xmQWx8
-UYDQerNHTJ/zeiaYk0zpbuyg5n51mM+SveIO5/mS/Wg
+yOKmwyPMewGhFiTv3dziD/KVZyaKhzchWBVZPOJBuSw
--> ssh-ed25519 +xxExQ NiZ5avMq7Pf3OMjoMzkQAwAfIaXIEJmkRMCwPy63YDw
+-> ssh-ed25519 +xxExQ XX2zkyMoQl1wRtl2F6IONz2qA3Dc7nB527/iw0aV8GQ
-ZlS8OeOwzqeIRP2+uKDzS310hSSbDj0TI5ojnu+SHxA
+MaAGFaREFUQpLmP9pth5j6iBAYAiA4ljTjnP0M9O5LM
---- nQTE15m0XzI18AGBTLDZLi8LswcvqazxsWECDhD/1mY
+--- XY+5Qs9iHayv5OiaCXM+Sm9EQTU01DRIsIs42RQUNIM
-©Z¹Û(УŽ= ìÚÎ;^€Î|¼'؈ñÇš™d`ÿ+Ò`‡%IjdB9Ó›,ìã–Rf×&SR~
++¾6œGدrðn.¢z«œ¦Ý‘›¯–6Ï'	ÉUŠ×+
>_ìzïÔ\=>¬émLœÕ<13>òwkÔÔ

secrets/passwords/services/ssmtp-pass.age

@@ -1,17 +1,17 @@
 age-encryption.org/v1
--> ssh-ed25519 Lbmdyg xeCupwlI6S1vOgLUBmVra8mmMWso3Dm1t8bqiQnSl3o
+-> ssh-ed25519 Lbmdyg rWYAQ5jS+bt7dV+7etRub375/bw4Uw0cwMkzrluhfmM
-bmVA8lqi/Zvcjgoe7t1nQ1bIs3xGiyFh2WD/DRxjfyE
+bjm2qZXab5M2fvAwGb2PCZw+ObqyfPcg0gkppiWabdc
--> ssh-ed25519 aUd9Ng WeLBQ2Nnl+1+7mLEA6yujIiGplC4O5TsQ/Dv8Wk3GEk
+-> ssh-ed25519 aUd9Ng dYO0KMpJgJDaKMtL8WPur/g9nuX7uAZ27CG6chDaGmU
-EyVKG8ljmG+CtpdlIgYLp4IFCFjy929cYexnLjv8j3s
+j0a0C9MbD6HPA3TMtv0eHcqmAOkzWUA4UzErR48nmuM
--> ssh-ed25519 hKAFvQ he6iNkqynFjT97tLBqVuReahpU3VfpSBlUuatTHBnVY
+-> ssh-ed25519 hKAFvQ VVCFaWg5NqRAbpwPTUJ4q5548UxzdgnEcUk8so/w3yM
-M5vx+jOC8iRbaE1IoJ2NBaqDun2kr0lCidiOEgT9nl4
+MBtDQBpC1tDZnI+AFBmTz8TlniWmUPqtkWKROWOy/2A
--> ssh-ed25519 9+Fe5A FN1qaSCjYRJ0l/n5KFMnM68vQn0Rw040pJgwW0HkkxY
+-> ssh-ed25519 9+Fe5A CjilvGakncNaAp3E4w7x1P1aknKhYemV58FcC3pabEA
-sD+Erg6hLCD579qFi3ybyc+1hb0cHJfICz3lIkhwF84
+3LsQ85r7CoAdxeM1gIvXPw/UynJuJ1ufWgcMcRrTUhU
--> ssh-ed25519 9PfEBQ kk69r/Fixc5yBh7mZKbA5vtZsz9Ek6UAEp3rlZZqThM
+-> ssh-ed25519 9PfEBQ uPAWLiqtohRlkkHSl/zaoyiJyJpdMFaf0Scu/N65Qjo
-wK2PDERnIEaz5aCrN2wKclCQIMBxjueyy6aX34N54Gk
+BzxJR1ph+s3mQKvWmzQLPTJi8O8Dig+XX0KKeKQpEh0
--> ssh-ed25519 s9rb8g kD68d4a2dQjR4GDUFK28wPpTIvlOcDoihAjgSV6chEg
+-> ssh-ed25519 s9rb8g /sSO+BDGFA2iI9RTvznTScdAKII+hrw9gszKo+CEiB8
-x1Cpn56elmlo3SV4A9hZOmKO7L0P6jo/S9khxtmH90w
+xaiWenfRxyUwUErLBrLZ/xscc2BWXy9kPBW9rhbB8As
--> ssh-ed25519 +xxExQ UROsPg5x7cpNmsF7cYpupU6BjGn18lNjpIPQ+lxKyVw
+-> ssh-ed25519 +xxExQ woVJdSBBlir6ppu6yMieVlZGXQDLJ9M4LPKrTGcKZFw
-CAv2NJ4bREgnI3EyGpFSTDI9QM4kMNJ2dPChMuHT0ZY
+uTm49ckSfcN7nvCBrzIM/0O5NjeFOwzKFMI6mAoyXUg
---- 0vlsvCx4ahHKR2WGAM/y4Sv/Ox/2+8p5XFKizjCa2x4
+--- hvCa/CvDlYzJSv1DuPaHsPRl4JSvsrGdAw3DRypHces
-z碪兒任ﾉｪ?+｡-'絜ｪN綏ｪｿ.Q-霆限h椏<68>(<Mｷ=溿ﾊ聞<EFBE8A>ぷ	
+½Hî/¶2Ÿè†y¨_Ç®‡”N<ûÁÀ3e)™ùvjsO½'HT*AKø¨ëò–Òùˆ&

secrets/passwords/users/root.age

@@ -1,18 +1,18 @@
 age-encryption.org/v1
--> ssh-ed25519 Lbmdyg d7MMLPLB6WoQ6fLqXNt1lF1JNcXlMQg1avyBW6o0jA0
+-> ssh-ed25519 Lbmdyg zSbZ1JxLiNpy1NEyXZ5rEiBhwePYDX4v973uLfZP51M
-nYTqcIfsy+ZiXEvoIDu7FF8s3NYkfFaZY4YCnABN+xc
+uB+KQ76yFlSDpP+QLlZmr408FSPuVccPKisRClQdvRw
--> ssh-ed25519 aUd9Ng gau61aj+lg6Y6B8G7Rzy1WmTtDmUu9Qkhm78/tXOw0k
+-> ssh-ed25519 aUd9Ng pWvp37LjgcVAjYZHTGkLMqQYd+e2g7k1385oE9/lYH4
-JFJ5CzFmDa73WuWllEFe14siXlMU04zt144Cftdoaik
+ZrccfOEQMBCI2+ayjW9P/cqPl1Gor7UJ3TFC7lQMg1Q
--> ssh-ed25519 hKAFvQ A7lQjAgw8Ll5Eg5+3m/d7SMV0jenS5+nE/R9DK9YX0k
+-> ssh-ed25519 hKAFvQ 2hFCp8gLvCX1zqFFzUJoIieLa7+2aVeRyCRFyegbRWo
-9FUIPnGNYGebiBEu8vZE+AKEO2WEy0Ipaz3kGylzcns
+BSUK/Azzf0wJAlPuOY4rQPsN0OGCTPtlsmYFu5qsaIY
--> ssh-ed25519 9+Fe5A try064YTWtECrkioigxtYXPn5oGMTU98l5YfjxlhVwM
+-> ssh-ed25519 9+Fe5A OZAthYKVhizQFsthJAparozgSFb2Zb2/5MRzg2tTIGI
-aEQnro8S79wXhQ/klDqryAVo0cfZ/s05VCF3FAqtNh8
+2/Fcr3iIu2UK2Xz9TZSwaOuPV7mVVcdHAkaR9dkFY9Y
--> ssh-ed25519 9PfEBQ 76j24TjmIiUKCvgsFypA3bTDfzuFM0mTQPnQ2xQySQY
+-> ssh-ed25519 9PfEBQ jsDAjdyYYZHQPFJneADzeyQi4ZrrQStUZ7Bb2irmTAk
-/B9/kZFNo2WCCNQTYzUHJEJ9NdTdRu+l+grIJw6cy6E
+/KrE4wtRXm2muX0bSSV3BTG56u4OqpRhjxJhLDBuxWA
--> ssh-ed25519 s9rb8g 5B69ltq0ZuKTNs4W6CDSIdS8qOOoWs1bLGjqcRKbv3Q
+-> ssh-ed25519 s9rb8g HAGcPh0HjKtiewYqQwox3AIvHp/KDDKROAstbf8RtVk
-fMtZNPL8KCpW9mauUmNXpPzbkUkP05ozvRiEHvQyWLo
+x0Hw4QkkayukTZbos4AoDs6t1y4B7DHXevC4269B0eo
--> ssh-ed25519 +xxExQ nu3EskCYEk5PhvZRi43mTBFEn7qhNaKxxPNiUWrRXl4
+-> ssh-ed25519 +xxExQ TmRW0nlIbykeBBjPe+TBz64jY1/PVlS+wWvq/YhGfTk
-JOqffFVyi6xJI0ziszGQgQ6TepJCeFx3VvIpGakREGA
+5WdC7ehRLjEpDM6r6rmPpK77zewMHloSneTs7WwEYBw
---- QHtQUnvar6c9AYQJ6Xj38kypyNVR7oJqj23uVeJgs7E
+--- RD5lWGw0AhWNIQRc7MI3bx91LRt2fTNiGom7BYB8Gos
-™õí
ð¤,ˆ“–\Ðu8hª<68>Áeùã»m·.n4ÌGt|ì'ÛÕºZ¥mìÊ
ÿ÷PL+Érm0â9g¿Û OÔ<™Ü
+?o1¤tâu¢xT­¬px's›§*vþë0"šÔòÞÐLSÅ»”´Ív¸™³É¥Ý]àÌ(Y_{yuL
-+éÃ;Þ¡â8<C3A2>E19—º0Íü–¨h &OÎjÓoU€¶L]¬ìQ*ó²@ÊL‚tfÏnØ—¯/í°Ã‹»¥·¾‘
+;â/.fÕf¹€ØYgÿƒL îž}>
ûÆ›Ø
ƒÄ$í	ºz8ââÓ¬~~€úÒ/¢Q–¤éþªLé×$+œ 'r»>sIG9ïw¨J