diff --git a/hosts/envoy/idmail.nix b/hosts/envoy/idmail.nix index 46e0de4..ff8d5ce 100644 --- a/hosts/envoy/idmail.nix +++ b/hosts/envoy/idmail.nix @@ -18,8 +18,6 @@ mode = "440"; group = "stalwart-mail"; }; - - shortHash = x: lib.substring 0 16 (builtins.hashString "sha256" "${globals.salt}:${x}"); in { environment.persistence."/persist".directories = lib.trace "stalwart backups to dusk!" [ { @@ -30,20 +28,12 @@ in { } ]; - age.secrets = lib.mergeAttrsList ( - [ - { - idmail-user-pw_admin = mkRandomSecret; - idmail-user-hash_admin = mkArgon2id "idmail-user-pw_admin"; - } - ] - ++ lib.forEach (lib.attrNames globals.mail.domains) ( - domain: { - "idmail-mailbox-pw_catch-all@${shortHash domain}" = mkRandomSecret; - "idmail-mailbox-hash_catch-all@${shortHash domain}" = mkArgon2id "idmail-mailbox-pw_catch-all@${shortHash domain}"; - } - ) - ); + age.secrets = { + idmail-user-pw_admin = mkRandomSecret; + idmail-user-hash_admin = mkArgon2id "idmail-user-pw_admin"; + idmail-mailbox-pw_catch-all = mkRandomSecret; + idmail-mailbox-hash_catch-all = mkArgon2id "idmail-mailbox-pw_catch-all"; + }; globals.services.idmail.domain = idmailDomain; globals.monitoring.http.idmail = { @@ -64,15 +54,15 @@ in { admin = true; password_hash = "%{file:${config.age.secrets.idmail-user-hash_admin.path}}%"; }; - domains = lib.flip lib.mapAttrs globals.mail.domains (domain: domainCfg: { + domains = lib.flip lib.mapAttrs globals.mail.domains (_domain: domainCfg: { owner = "admin"; - catch_all = "catch-all@${domain}"; + catch_all = "catch-all@${primaryDomain}"; inherit (domainCfg) public; }); mailboxes = lib.flip lib.mapAttrs' globals.mail.domains ( - domain: _domainCfg: - lib.nameValuePair "catch-all@${domain}" { - password_hash = "%{file:${config.age.secrets."idmail-mailbox-hash_catch-all@${shortHash domain}".path}}%"; + _domain: _domainCfg: + lib.nameValuePair "catch-all@${primaryDomain}" { + password_hash = "%{file:${config.age.secrets.idmail-mailbox-hash_catch-all.path}}%"; owner = "admin"; } ); diff --git a/modules/globals.nix b/modules/globals.nix index 92d36e8..ea02557 100644 --- a/modules/globals.nix +++ b/modules/globals.nix @@ -108,11 +108,6 @@ in { })); }; - salt = mkOption { - type = types.str; - description = "A salt value to use for hashes. Not secret, but also not public so you sneaky little buggers can't brute force my mail domains."; - }; - services = mkOption { type = types.attrsOf (types.submodule { options = { diff --git a/nix/globals.nix b/nix/globals.nix index f55f43b..6a38bb1 100644 --- a/nix/globals.nix +++ b/nix/globals.nix @@ -39,7 +39,6 @@ myuser net root - salt services ; }; diff --git a/secrets/generated/envoy/idmail-mailbox-hash_catch-all.age b/secrets/generated/envoy/idmail-mailbox-hash_catch-all.age new file mode 100644 index 0000000..165a1b4 Binary files /dev/null and b/secrets/generated/envoy/idmail-mailbox-hash_catch-all.age differ diff --git a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@2171ec5b4ea361de.age b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@2171ec5b4ea361de.age deleted file mode 100644 index 75e6d20..0000000 --- a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@2171ec5b4ea361de.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> X25519 CeH+tnK4OQzA5v/f7kIMDf9RIMI1e72YEySwz2PBEgc -i23gQemr2ksxDEnt3aWQw3FIVhGM/xziP93nk1Ir/x4 --> piv-p256 xqSe8Q A1V+k4lUn32myofI1XTxftahy406vcTgYplt0vqgihiS -Uazn50vnyOSetVFecF0MVrA/s+uUaG8do4j5OKjRecE --> 9=R:p$sS-grease B -k4WhV5P3niQ ---- ogrN6i/ACEBCXgof0mFVOGInAublFrtgVsxnO0VJGhw -qt1N(Y5gǙm'VN\ ٗl}$mQd*"d,԰܉uuE]Bv_US-ղq)D|A_ 1ms_f; "Aԇlc5g -wq܋ Z \ No newline at end of file diff --git a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@30a80c5c819a6d2f.age b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@30a80c5c819a6d2f.age deleted file mode 100644 index 67101ec..0000000 --- a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@30a80c5c819a6d2f.age +++ /dev/null @@ -1,13 +0,0 @@ -age-encryption.org/v1 --> X25519 zeQXHgI6i7n4tSgyNtY/ayfLFx/yEyEe6jrsuPhlKxc -UJb99a+ctRRUHesNoYNZiBJoFxpVVmJHnxZu+JEDMQU --> piv-p256 xqSe8Q A+obbTep4gXE7xfziPNwzJH9fV0WOkOmO8H+eXT8qtup -zayuWVxAVrGGDzfF73lUGjv5X3t5zMPFrqYTetuJRsw --> ,cDj>-grease -oKRvL5mPxoEZOaHqHzpa76LbUPJ4wBRy2L1JWMZngQGZL1gSnl08IblxH7E3uzRP -hg6tAs+xy1atzYpO3OrQ95YXvx9/u3KkzLazT6Xg2NL1ae8/mH1GWUXPgeGZSB4o - ---- /oB+NUhsHeyPgdyMEfVh0SZ8KAijRlmHM2YapZj+2+o -)EV/@Bzk3c LB*[{7̟>3Qh/N@†)**Zw6 JehJڍFd1vVrjB5k -ŎpԪs\`Әt(? -m/t{)` dXC \ No newline at end of file diff --git a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@39e88e1845ef6176.age b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@39e88e1845ef6176.age deleted file mode 100644 index 8941bde..0000000 --- a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@39e88e1845ef6176.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> X25519 dkR6qy+QUFJZ2i3qusqZnI0dWHoRLc9Igi9ORE+JfXc -JCNaNRAHvu93EWa+ljF8RxcnOZ+NrEKj/SK0FCiadqg --> piv-p256 xqSe8Q AsSAPBTzJZN/K/dP1lgDWOjEnSATDJCY/B4r4ZQnREeZ -hp3OEt5ukv6qYln3SoMJCdVJ5kVX/U1tLN4LnVzpaXI --> ZIX-M-grease BB{: m^Z4(@)? -xJMoDs5/LbDSWPtK+lDwlrOCotXafNSxN9OeSA4mzCFeKFVh3N2HblQwCkuQH3jv -4JU38yBBKH2sbQllW+b46JPQIuNPPJpO3rEYAcVGIQWjF1UzdQQ ---- ZHMq4nbFdeoWY57yzJLDZTZwla2Wp+hrbcx+P7U6zbM -H_ 1cYDw3,mD: "/Wi&No? -M 9Ν7 X25519 NdHxd58y5lzxKRLe3XyxGPw3xCPMEZ+o1AY86sQ8+F0 -ll17drYoij37/QcsH6UoasGnrtqtaCqlNjmrDePCzZU --> piv-p256 xqSe8Q AosgFkvU7LR6xlHAWX28WaAWD12EVA0SzGwzWJqfukl6 -QD/MN7bylXGGn3OEav3xOPUxosIYA/eKPBwvvKJDj40 --> !-grease ~@dzF ;$>B =~|%) -HrIH75+nOCur66oCiCllFosexaq+Z61rViksP2/qPDFnRnxAvatO5IcomeG1XWwA -BmTikY0L4YDbaNgXd7q1G/w6MQ ---- gsg93kUeJDvZHg72WkGZg5UnztuU+jn9W9XCDWPoXQY -/| ]l)װQTpDތfW<p7/i;jXU;"UH?;pP%Oo~m6q-* 3` -Z8;W(hc܎|\u+yX_F \ No newline at end of file diff --git a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age deleted file mode 100644 index cf106ce..0000000 --- a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> X25519 +s+77nOO+cS7bp9nfsr1z1lZ694sB24owiA2c4Ht31k -EqhZrSJd0KOOTWguj5pbVKMWTU7gJsTPGaJwiEpoUn4 --> piv-p256 xqSe8Q AgYdANyvyNGV5+XZZqLPFBfKkEP/7dq3rD8hCrn7GIZv -Xgm9+I5dtpz4xtb75gmRh8a7ZbHNm2B2dO/DAB4bunU --> "%-grease &[6~r^ -LKbB1oBz6Uku ---- qdIA+CPQamO9SkDnvhKWWXUf34EA13vDzGvUpyFO6vg -/AU;8!@u)cЕ!V/*qamtOOً緛pI-*`S(sq$c}g -@ (\9ΗJᬮ1qݧEL -,~uD^ "} :ɔZ \ No newline at end of file diff --git a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@7b098b000a97e947.age b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@7b098b000a97e947.age deleted file mode 100644 index 8c6039d..0000000 --- a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@7b098b000a97e947.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> X25519 HnXV49j7LGX1lhIkTA/OHYnEhxBXmGafYlTrZHfKw3I -bWOtPGlWDS0tT5C9UwlnhFdtKE7vhg/EBE8NdAAaSLE --> piv-p256 xqSe8Q A2agFpB04VkBM6Lxb4yJtD6IJtW75Q2VRfTwYRdFGfm0 -/l0hugrhmfM1xbQJntgTcfBEFoa2dQYZlSbkPKKUyn8 --> +0(<-grease SF=Eo? 1=n>,W^ i -sp7ckgICxHhYCw ---- 6zgdf71S1bSQ+HlG9lQEkgAoA4AGbyB6dKbXnlSTr84 -Jy8wWEY4>2sߧouCYG 'ɰHHFaύuuZBNǎ3+G-|+\Yx3I cJ -qPd X-7!\%5B \ No newline at end of file diff --git a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@b3ad8b0f0313feef.age b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@b3ad8b0f0313feef.age deleted file mode 100644 index d41285d..0000000 --- a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@b3ad8b0f0313feef.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> X25519 hKanA62/KKBQwB3CX3hU2t69UsWJjs/aR3mQ1owEgmE -3+fSp6vIS+kaFYc0PMICVjRe3g4O+Q0nkfOqA6w3Gnk --> piv-p256 xqSe8Q Ar52zmnA3XAN4SNj99HlBmqypVmeJm8dBaLCORiVqS6W -erCzePp47eJBzvTfLaCjAn9r9dvtwFJ5cwVq6vMXKmo --> wf\P-grease rSAj1,: -WohB12+Sp3ye+0IM5opVdakNqsAYYmYIt0YhhDO+v9NBP5cT1iimMJvqT9F7kD/O -KJWpGV68EUWNgI8kLulNkAx/IYCV12K/kudw5VCERy1sQSG+p/EKzC8uXUo ---- 9B5Cl/W5ZBIdz3GTAi8Py7iAv644efj+yXQt+HWuCNw -O<=>j4JZ\$A|aYs}Wk2 Żߴs >uBa\AJt!*QU+12HcuE{^̹9Nq֋<`r -zðek;IH \ No newline at end of file diff --git a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@cde738bc7ba35556.age b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@cde738bc7ba35556.age deleted file mode 100644 index dbd484f..0000000 --- a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@cde738bc7ba35556.age +++ /dev/null @@ -1,12 +0,0 @@ -age-encryption.org/v1 --> X25519 xvObRalAv9iB59r1kenQ5B4Ro3Y+JdITVUJoOAQYlm0 -M8E3UehdNU9DZOQVeqhBychV+iCLf/r/kgIV20aBQCM --> piv-p256 xqSe8Q A3roICk0Jnw1doEBHYKZ7Klj41fpi4nAk/mlbJc4WeYY -53tiSY7UqjVdLgEO0COsk9rzqbhbcmf/ZDzdi/3kUe8 --> g1:-grease k F O"TO~ -lJWC237hwN0E6kOYUP938AdPQITSSXJjM1787AHRVOrSbvZc2LaTDLnOdB9nZp2x -DPND/aSR1jMRNN+B7XNV0h24I8+aPOCTd/d4dB+Qftgv ---- +ihypSFxgTUt0eMOgQbkRL0lf73Mowhvn87pNoUTxjg -{}gЧt -r@ӟ98B -Sr+ɶFcۄ!,Rc̛8j!G4R '($TBD^F Q=Gx@奒{8v'3!HJ/Yrig \ No newline at end of file diff --git a/secrets/generated/envoy/idmail-mailbox-pw_catch-all.age b/secrets/generated/envoy/idmail-mailbox-pw_catch-all.age new file mode 100644 index 0000000..9a9f4f3 --- /dev/null +++ b/secrets/generated/envoy/idmail-mailbox-pw_catch-all.age @@ -0,0 +1,10 @@ +age-encryption.org/v1 +-> X25519 v4Gdn6Az6tYlt0ScF2ToYqvJSSykBWnwDHZHXDruHH4 +ZR5xAVFqahqjDkWOS4D7ltO5s+mLWhwGnEjsZNtiDm0 +-> piv-p256 xqSe8Q A2DfCZ7zxdlAKUsaZZej+7iXrp1eKLQ1VM1vtrUfHMAz +u8yqGoJWttzaDYbw8WNehavWEswBse6VbC+PyjUuYK0 +-> gb7-grease +YgwdLWp4699v7OljSY0h5YFs+yZKBQrVOCK2Wa9itWQ5vQ+0yLqoZXMHlhfS+Tmo +ynRpjs1nVyLQ2Guin+c4XzWeRqT/jYZOljzPCDIxMTpOHo4IqWCM +--- T3I12O6Hy4sZ5forxBqEYZqaR6rAQxkRhbOMWMF65+0 +|WvR3MZwh]Î11ҹ#heF/c`%s"7/|)?8LѴHȅ^L>' \ No newline at end of file diff --git a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@2171ec5b4ea361de.age b/secrets/generated/envoy/idmail-mailbox-pw_catch-all@2171ec5b4ea361de.age deleted file mode 100644 index 6c0c17d..0000000 --- a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@2171ec5b4ea361de.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> X25519 hwiSO2uHMPYqzcHJe+fJNZQthIheNV+z8QzNRR19f30 -gJ2hYbFPvENqg2UtwgdCFKRlNB7pksSipl61IYD6NlI --> piv-p256 xqSe8Q AxLma+4Ap7aFLCZb6gt/VdbL78lMwp7zw9Y9E2yyi80A -GvLv0n/kqC6xksv+nn1AEuwtGqd+vT5ivwo1yvMg+h4 --> XJ0-grease -Njn6lpWsxPRwkFg9asSo986W1Cd0Lhj4VpGbXyBkg2TgdxLPZKN580tgk3e6jwc ---- mFCHJ/g5E3KqSoGdYMA4+6NnbaHYMoTmWnO+AeQuRwY -oi)$7Xzrǩ ?E !c#u=C-/]{RXRĆ@.MC`qH D@ \ No newline at end of file diff --git a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@30a80c5c819a6d2f.age b/secrets/generated/envoy/idmail-mailbox-pw_catch-all@30a80c5c819a6d2f.age deleted file mode 100644 index 4466acc..0000000 --- a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@30a80c5c819a6d2f.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> X25519 Ied4Rc6fx3Wrkq4DAEjr3KTqnrR3VgzZ3uHZsbTUr3w -1kMMehvutM7wCedlVYg7Sys2Q7aEYxRO8Ajqp4bYXIQ --> piv-p256 xqSe8Q Ah9bkx79XWlb/zW/gVRtTmOcsOcTCaU027jz/vxBjp74 -fi8FQ+rQILsnlxTC1/MoagAL7D4lqyR0QYaefAi9m3s --> KW5K]-grease [K{/LCm5 s2 -TcDYJHaundRXKi8+K50c8FY/fIv2m28daA ---- Km5TCqqCFoiI0CmtBwTFNOjKtJ7tXKZfzTJocBIeH9Y -rrW -bzc'/kwd le[al7OgAZ%ꣅCtzjɼh-dG \ No newline at end of file diff --git a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@39e88e1845ef6176.age b/secrets/generated/envoy/idmail-mailbox-pw_catch-all@39e88e1845ef6176.age deleted file mode 100644 index 6e7396b..0000000 Binary files a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@39e88e1845ef6176.age and /dev/null differ diff --git a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@477075fe5513c902.age b/secrets/generated/envoy/idmail-mailbox-pw_catch-all@477075fe5513c902.age deleted file mode 100644 index 460d3e4..0000000 --- a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@477075fe5513c902.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> X25519 TbcDtTD07pJ/Hxs+1wWcvk+fB5oPYAD9wklnyAcEJ08 -Q+YwFN8oKy3I18z4/pLEnsvA/yfnYun+Bz4M1WEV+hY --> piv-p256 xqSe8Q AuLtBYkwIATPvcb3Se1yR7BL2qgeigjLtl5+rF+pPFVV -CmE6/5sj+Fie3hZqIWI7vtw+FQeVIh4q1xDkIAlGaV4 --> }PFmeQ-grease N=(Zr -M/UiKZLS9K6xgn9mfMXC/akO7cWtbWDoG68GF7LDOT3khbvuG+Ol7+Mw8r321P7v -fLrjgfqCug ---- 3GiwrF82wC51ln1ZoPr8heBKPG3smcTHrpn3QwuP1SA -vMꮎv$iԋ;(L9ϸs-1[Bqק5뚥8>Kbl(( 1H \ No newline at end of file diff --git a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@5b58b7c64bdf6ac8.age b/secrets/generated/envoy/idmail-mailbox-pw_catch-all@5b58b7c64bdf6ac8.age deleted file mode 100644 index 944d101..0000000 --- a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@5b58b7c64bdf6ac8.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> X25519 lAFGflmWdJh9wzYqQF75W9A7yWnJpatVTSYL+UnShmc -5G176dn4/b0hBFMNxged8HQTJc6/i/kiWG9U2We3Z3I --> piv-p256 xqSe8Q ArchEEGFmxin8qORVYBYG76Ta11kuVWQoEwA3VnF6+ev -/KSenFW6R0mzA8rdYX10O0QlE/pJj1P9+R3oLULuev0 --> Wm:Yith-grease bk`Ui9y M9L -hZ1ei31xfhAZisW6DXlo5+4919PYx5QtDTgL0IbHbnWXYr+NSls7KPyE ---- NChUIl35wGl5r/FYvovD8x+RWuVilpqsm5xqvOr/FH8 -aRQ9h o+M%3ݕύ}|) - 3Kw'D5:+6%͜mUձ m4F \ No newline at end of file diff --git a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@7b098b000a97e947.age b/secrets/generated/envoy/idmail-mailbox-pw_catch-all@7b098b000a97e947.age deleted file mode 100644 index 462cd8a..0000000 Binary files a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@7b098b000a97e947.age and /dev/null differ diff --git a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@b3ad8b0f0313feef.age b/secrets/generated/envoy/idmail-mailbox-pw_catch-all@b3ad8b0f0313feef.age deleted file mode 100644 index cb74c1d..0000000 --- a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@b3ad8b0f0313feef.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> X25519 jwLw0ZQDE0oPK1pfI+SE6pPHFmXTjBBR9bKGlwpRxg4 -9cvfMwxS/e0xRIUA4/bzFhBT/qu4yStCWs3NKnr7n5o --> piv-p256 xqSe8Q Aklmj780XFjRXB6hP5HICrYvnqpHxI4V3XKBoCVGV2i0 -LJ1Ugx1hTOo/0USFYGM4KGv54qyi/6V7wDv1czFCT4E --> gC-grease - ---- 2J6EqVCz9ZYUkyEGMbUraHE+SknGrsanAFBeFivNmJ8 -BgzyU mt H̨n*ZUw (%$4֗gT:Cc& -D)3%./Сh3=~߲ \ No newline at end of file diff --git a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@cde738bc7ba35556.age b/secrets/generated/envoy/idmail-mailbox-pw_catch-all@cde738bc7ba35556.age deleted file mode 100644 index 5d1a1e1..0000000 --- a/secrets/generated/envoy/idmail-mailbox-pw_catch-all@cde738bc7ba35556.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> X25519 tHxG6fGgWTc55QntSpCGlHlLmoybQBm5uySO0JDFlFs -keCZTsYnm9PpxLFbqT318W9O26MQPrLgSoIO2ZZBkts --> piv-p256 xqSe8Q Aho/0opoUZGV/WfRsZ1q/EWhW5yjB4EP94DrKaDGcjBg -WLdqd0YwFDLTYGSMeMww0Mgqw3MZBqh2rdJJSo9jifs --> (F7y+-grease PHIp60- -5krq5aozR08UQTSWVpeiYV6imrnMw2yeeY3lhUpAG5UPdIWVwWxvut22cAr0f4/T -fs/OB6IYy7wBhzfd1Ba/hXZNxwHwM6ohBpU ---- sikO0jRf7KcPPuQz6Fs4EQRozL8++s/F9pXQGw+qKRA -&mm*8ɘUO -w7z68O St@¨_E[ꜾM69BXG} ?#Per \ No newline at end of file diff --git a/secrets/global.nix.age b/secrets/global.nix.age index 02e09a6..eaf1b19 100644 Binary files a/secrets/global.nix.age and b/secrets/global.nix.age differ diff --git a/secrets/rekeyed/envoy/094b537b793ed00fcca8a4ff65da1dea-idmail-mailbox-pw_catch-all@5b58b7c64bdf6ac8.age b/secrets/rekeyed/envoy/094b537b793ed00fcca8a4ff65da1dea-idmail-mailbox-pw_catch-all@5b58b7c64bdf6ac8.age deleted file mode 100644 index 4f58527..0000000 --- a/secrets/rekeyed/envoy/094b537b793ed00fcca8a4ff65da1dea-idmail-mailbox-pw_catch-all@5b58b7c64bdf6ac8.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 rz300w OkYHAta0AExLlkMIAHvjY+DKkvhMPvQ75eI57PbQgWo -Y9bzTu2PQOMUNPf5374N4UyTQzPSnOs516jbKFacsvw --> &-grease -yM59yW9IXM7h4kU81cj2P61jg5Rr2uk4FnS9dGlSVhOmYMADIy2mgt9huk2/CICB -WBFmMlsq ---- mqzSNgjR/BjsBU8pa9NKgmEFaVagLsTe5SE6ZehxC3s -|2cjGH> h}۠cGڳXƺ* -]XIbb-_n\ؔSt\XO \ No newline at end of file diff --git a/secrets/rekeyed/envoy/0f7d8523c4d8a0757cf54379bc8c222f-idmail-mailbox-hash_catch-all@b3ad8b0f0313feef.age b/secrets/rekeyed/envoy/0f7d8523c4d8a0757cf54379bc8c222f-idmail-mailbox-hash_catch-all@b3ad8b0f0313feef.age deleted file mode 100644 index 69c896d..0000000 Binary files a/secrets/rekeyed/envoy/0f7d8523c4d8a0757cf54379bc8c222f-idmail-mailbox-hash_catch-all@b3ad8b0f0313feef.age and /dev/null differ diff --git a/secrets/rekeyed/envoy/349f2826f7cb9c0c09163eb767d9ab0e-idmail-mailbox-hash_catch-all@477075fe5513c902.age b/secrets/rekeyed/envoy/349f2826f7cb9c0c09163eb767d9ab0e-idmail-mailbox-hash_catch-all@477075fe5513c902.age deleted file mode 100644 index a51d9ab..0000000 Binary files a/secrets/rekeyed/envoy/349f2826f7cb9c0c09163eb767d9ab0e-idmail-mailbox-hash_catch-all@477075fe5513c902.age and /dev/null differ diff --git a/secrets/rekeyed/envoy/415227f31931ff0e3b6576bd081dbad3-idmail-mailbox-pw_catch-all@39e88e1845ef6176.age b/secrets/rekeyed/envoy/415227f31931ff0e3b6576bd081dbad3-idmail-mailbox-pw_catch-all@39e88e1845ef6176.age deleted file mode 100644 index 8892a24..0000000 Binary files a/secrets/rekeyed/envoy/415227f31931ff0e3b6576bd081dbad3-idmail-mailbox-pw_catch-all@39e88e1845ef6176.age and /dev/null differ diff --git a/secrets/rekeyed/envoy/41c9640cb2203dffdeb23d6faf3836b9-idmail-mailbox-hash_catch-all@30a80c5c819a6d2f.age b/secrets/rekeyed/envoy/41c9640cb2203dffdeb23d6faf3836b9-idmail-mailbox-hash_catch-all@30a80c5c819a6d2f.age deleted file mode 100644 index 55950a1..0000000 --- a/secrets/rekeyed/envoy/41c9640cb2203dffdeb23d6faf3836b9-idmail-mailbox-hash_catch-all@30a80c5c819a6d2f.age +++ /dev/null @@ -1,8 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 rz300w pcMNdHHplWXKY2OL0NSE282qJJg6bW1fwW7XYJBYCyo -xal2I5uWeqmZX0Lk5u4vXsjMlhAjBlBXhrFaBMU3Dls --> K(,vh%I-grease BgGNQ YdL: -d9x56xlxkFAuVSqCZLJiljPXj/sKbSGMtW9iJfU1X9uydQZwe9dp22p6wWJA4C+M -W1hmG1lsdvMvyanKS6dAlf+CtJRsSB+POJxdMM3mofReIyiuS1CiwLOB/ZjJ ---- cZ5bRSW5y/K8VUvXQPF6AIp6tR+E73iORyEDyH72ewM -g%">lãL}qPy&|:K=b۷jE6wN)JtT"'h,.pHRj9a`}Jia{bu/S GS (?N+r, 6 {T \ No newline at end of file diff --git a/secrets/rekeyed/envoy/547f680266c71033c2d42282805977c5-idmail-mailbox-hash_catch-all.age b/secrets/rekeyed/envoy/547f680266c71033c2d42282805977c5-idmail-mailbox-hash_catch-all.age new file mode 100644 index 0000000..9b2b487 --- /dev/null +++ b/secrets/rekeyed/envoy/547f680266c71033c2d42282805977c5-idmail-mailbox-hash_catch-all.age @@ -0,0 +1,8 @@ +age-encryption.org/v1 +-> ssh-ed25519 rz300w j8mWvQ9aZzudPv0hITmgxQiZYLJu41sxLUkhYBS0mH4 +7Fb6MuBVcZLsbEknAEERh6CJVnBzUfGw6P/LetHqrYE +-> C-grease b2WGKKnS -8 [qupf2xg +/s9kbXHuOaj48/0FciN4V5DWZZJcC05isW7V3zVI21ZCM6vDe9wfChl2mcLFrQXQ +6wFrbo0W +--- M7rg93/rjI7XdalptML6Rzp4SSfk6TrSkUPaphtdlTo +_mE)'>=N@Dz~hbF dZUƽIDX'v M}}:-TIl?j9K8z84IH9b7 ssh-ed25519 rz300w 9xHKoTsXryIPchQHpj0TCkrjYzJL73X9E4PatTkpcQ4 -uznzwCWVlaSkd3TsgeUE7jIqPGEYtrorBAP6Q2ep4zY --> x-grease KQn7 -vP56IKkmO+GVptk+iworBsPIpT7AqnMISw8yHHhCNR2Ihy77KCjBscM ---- fEohwNhvtx1ArxQ7L5qnFjF9UE/0SaLRGnXB2rjuW1A -U S&Eujnn - -DBeE^V+igZ/7# l=BЭC2')Hq \ No newline at end of file diff --git a/secrets/rekeyed/envoy/654e667339ee8e4fd5c77e69eca3d8ad-idmail-mailbox-hash_catch-all@cde738bc7ba35556.age b/secrets/rekeyed/envoy/654e667339ee8e4fd5c77e69eca3d8ad-idmail-mailbox-hash_catch-all@cde738bc7ba35556.age deleted file mode 100644 index b4edbf1..0000000 Binary files a/secrets/rekeyed/envoy/654e667339ee8e4fd5c77e69eca3d8ad-idmail-mailbox-hash_catch-all@cde738bc7ba35556.age and /dev/null differ diff --git a/secrets/rekeyed/envoy/65fadf7ccfb558182fa099b76c0526db-idmail-mailbox-pw_catch-all@7b098b000a97e947.age b/secrets/rekeyed/envoy/65fadf7ccfb558182fa099b76c0526db-idmail-mailbox-pw_catch-all@7b098b000a97e947.age deleted file mode 100644 index 32540a7..0000000 --- a/secrets/rekeyed/envoy/65fadf7ccfb558182fa099b76c0526db-idmail-mailbox-pw_catch-all@7b098b000a97e947.age +++ /dev/null @@ -1,8 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 rz300w N9mUWEbdNtvw4jZskXt2ZGzBwXxNGIcAIgQWSNtu9zw -7iNU3zvlMWfa4iXY7BVqlCzRMaLlsC+0quWQwUYUozk --> P9[M-grease -GpkRAuOj5FHe5xuzeZv6mh5PKUWMtyRqC1iVoitoE7REUB6rpJ8oXvBPo173s43G -9vHQhmkeU1jEe/i8W/8iClm37FlPoA6OVQSmybGRiFuNWcsBOWi9l3kYn/bX ---- mhVs9W8Q0piMYZ5JV55ayDpTC13cIdp+jfpD4cy1TK4 -ސ+N3vi̾DMf!%9I]RN%8\?ͽPt$%7 q! \ No newline at end of file diff --git a/secrets/rekeyed/envoy/69b72d5bb1fbe6b941678114b8bc3779-idmail-mailbox-pw_catch-all@cde738bc7ba35556.age b/secrets/rekeyed/envoy/69b72d5bb1fbe6b941678114b8bc3779-idmail-mailbox-pw_catch-all@cde738bc7ba35556.age deleted file mode 100644 index d50de1b..0000000 Binary files a/secrets/rekeyed/envoy/69b72d5bb1fbe6b941678114b8bc3779-idmail-mailbox-pw_catch-all@cde738bc7ba35556.age and /dev/null differ diff --git a/secrets/rekeyed/envoy/805f6240a14f705662e6494d267521e0-idmail-mailbox-hash_catch-all@39e88e1845ef6176.age b/secrets/rekeyed/envoy/805f6240a14f705662e6494d267521e0-idmail-mailbox-hash_catch-all@39e88e1845ef6176.age deleted file mode 100644 index a93573e..0000000 --- a/secrets/rekeyed/envoy/805f6240a14f705662e6494d267521e0-idmail-mailbox-hash_catch-all@39e88e1845ef6176.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 rz300w U3sxZ7P93CV2cpgF1tsD1Wjxqqs8GwDwipWb9ENIbzY -dWzGD5tMLSjDwrInzJYnK54NQsRjt6X82pQ6IQfjh5o --> GzdbMpf~-grease e= !CBRiau -RJ2+WJBct1a9 ---- uNDwHNzqzO5dvH5LWFKeNe1lHYiU45ODNEtxI32E6o0 - [p?y[?:=|},=[ljKe|21vOWs_mχAqϙK(ǕA_NƆCVTQr r@y[>j`' 2 ]NIЪl ƮH\ \ No newline at end of file diff --git a/secrets/rekeyed/envoy/825a81b7e683a3e0e255547043cacaed-idmail-mailbox-pw_catch-all@2171ec5b4ea361de.age b/secrets/rekeyed/envoy/825a81b7e683a3e0e255547043cacaed-idmail-mailbox-pw_catch-all@2171ec5b4ea361de.age deleted file mode 100644 index 2a99490..0000000 --- a/secrets/rekeyed/envoy/825a81b7e683a3e0e255547043cacaed-idmail-mailbox-pw_catch-all@2171ec5b4ea361de.age +++ /dev/null @@ -1,8 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 rz300w S826+T9SqnIU4aCCCUdse0dfyoep8biPZpPcJd9XbxE -9hs1+nSJCo0Y6K+bPGt4Dg78WFVDwssNzrTw6o3GiJI --> 7W\[-grease HSm n^&7 M*nP[ uDc -M2eA0EryPobxGD9Ekug7PhY/9Lkh9afVQMGxFQlamPkYKzdq1VZCA+e3r/+cQ5Q8 -zPicDLWHBGB6ChELz61Bx6zwZrofiSa/cZcqeXTViUzfusY ---- fSUlFOyenk+vxDafcml8aJdVHY0MAOCU8J4Mj3Tr21o -\ԭV<01 l4$ruW صCܹʿu`ձ/HefK5V.)Eu \ No newline at end of file diff --git a/secrets/rekeyed/envoy/8980235762357e755523bd1e040cc577-idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age b/secrets/rekeyed/envoy/8980235762357e755523bd1e040cc577-idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age deleted file mode 100644 index a6e9df0..0000000 --- a/secrets/rekeyed/envoy/8980235762357e755523bd1e040cc577-idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 rz300w r8GoVnnGzz4+yhVSpShcyx7YvcTgMGc8z5Uwt7BXmTU -QRR3FD7JlsXTPdUamRJYd10xOEPPT/BaVNVf2fwlyy4 --> gI_c5-grease q(:RRm/ Z; -IXooCcoBCJfMLxO11P6Up7R9Z+JWxOrTewR0wL+TgRP70xqOmHFrEH5oWWB8J5h/ -B4hWURcfbRPnyIWjvNV9Wtg ---- M6vBlERAsyO6GgdhHJWzqC+lcmTgWlyVun9rGVEwg/g -&L -Xѡ1?gAӾXRtӜbĦt尟 y?)&y5Q<% 4!6ScpwGVWz se 7Au㇙vG \ No newline at end of file diff --git a/secrets/rekeyed/envoy/acf0b090d94289aa33a7abe02bb4b0e1-idmail-mailbox-pw_catch-all@b3ad8b0f0313feef.age b/secrets/rekeyed/envoy/acf0b090d94289aa33a7abe02bb4b0e1-idmail-mailbox-pw_catch-all@b3ad8b0f0313feef.age deleted file mode 100644 index 4270d60..0000000 --- a/secrets/rekeyed/envoy/acf0b090d94289aa33a7abe02bb4b0e1-idmail-mailbox-pw_catch-all@b3ad8b0f0313feef.age +++ /dev/null @@ -1,8 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 rz300w EJmmMDqhjpdje5w2XhXrTEmf7bM+z7nSOWBkdaDF41w -QTTc70EUolP/ED6dzSbmMlkGUH0tufl1nDw89Naamsg --> kh!x-grease V \ZB/O j*.b6m' -elk7wq0IFo0Wz03+g4Lh ---- P6ertGMfxGfckpYEcjd996vcGoRKAinM+k1dV/ExcOc -8WY; __SV:p" V܎О~L[xoa -YFk?]+d \ No newline at end of file diff --git a/secrets/rekeyed/envoy/c10c52704b0d55f21e277c981079b123-idmail-mailbox-pw_catch-all.age b/secrets/rekeyed/envoy/c10c52704b0d55f21e277c981079b123-idmail-mailbox-pw_catch-all.age new file mode 100644 index 0000000..be53a25 --- /dev/null +++ b/secrets/rekeyed/envoy/c10c52704b0d55f21e277c981079b123-idmail-mailbox-pw_catch-all.age @@ -0,0 +1,9 @@ +age-encryption.org/v1 +-> ssh-ed25519 rz300w wfFjAZWIBhnIHtE6Ik3LrcKFJlbdegzxjdJFUJSDoXs +uxCDJxGCOlPKdXDDO3sNKEDIsNstsdusFc6NXE3H7ak +-> r;-grease 2T?wf,m2 D"q} +RfsiCwtqrFaobDyanYhw4zZ55qNRblmd/ptJRT4BIAb3F2zOMUmEH5l9odukLTsf +lkdW +--- UwV8qwIqD1lcMhKAc+bcgPwXqet1tBc4pJnv0mkyU5c +G+;Awg,R8[eZ-#Pi'O +Ko@ }ܕ'@@`+UF/i\ \ No newline at end of file diff --git a/secrets/rekeyed/envoy/dceddc3043473dfa8d8c1976e9810622-idmail-mailbox-pw_catch-all@477075fe5513c902.age b/secrets/rekeyed/envoy/dceddc3043473dfa8d8c1976e9810622-idmail-mailbox-pw_catch-all@477075fe5513c902.age deleted file mode 100644 index 17ed851..0000000 --- a/secrets/rekeyed/envoy/dceddc3043473dfa8d8c1976e9810622-idmail-mailbox-pw_catch-all@477075fe5513c902.age +++ /dev/null @@ -1,8 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 rz300w SQoLq+Es6/NvmUCwNaPSMloLPpQ9GKbu6UES2VP03VU -Dzn8KF4fDL+NnIO3iOSiC/K0w4RGxau00v0oLbpDLOE --> Whx!)}-grease -CQXmmH5hUagWqNhk ---- hUTqCDD4arRwuHf3O1BAbiUxqopLpib1gJRkxqh37RA ->+!jdHmٞe=qISG@i>뽥 , -EFOغ'og-1FVʸ \ No newline at end of file diff --git a/secrets/rekeyed/envoy/f531d53bbc7370437753b0113cc74f0a-idmail-mailbox-hash_catch-all@2171ec5b4ea361de.age b/secrets/rekeyed/envoy/f531d53bbc7370437753b0113cc74f0a-idmail-mailbox-hash_catch-all@2171ec5b4ea361de.age deleted file mode 100644 index 6cae01b..0000000 --- a/secrets/rekeyed/envoy/f531d53bbc7370437753b0113cc74f0a-idmail-mailbox-hash_catch-all@2171ec5b4ea361de.age +++ /dev/null @@ -1,8 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 rz300w YsAynM85SuNZGEjuOKhADdmu6dQ/HZmBmspmwZq+UBI -pqluP+AcTDvEyJrnHaOzCzTWOQmIRCsPqnTp14zW17A --> kjP-grease C30%$ X'J#H[*g vZG VZB* -rRubcvsL+JLQWc/RXV3ajlRaDUvySSfDcjxRn6QrhpjcRNhYttFeGe8grbt+OV/a -E0atbC9H+GzXLFKLqwjYnmyjfRjRxFCyAFjKMMXDkMLnX8RtA4owOw ---- UWj4ovvbBmHN6TxX9s+3n8/3ioBNDNn3oT7Pb/B9W78 -ZhGczbsaZϐ|?'3