diff --git a/config/secrets.nix b/config/secrets.nix index 0722f4e..0b750cb 100644 --- a/config/secrets.nix +++ b/config/secrets.nix @@ -54,7 +54,8 @@ echo " -> Deriving argon2id hash from "${lib.escapeShellArg dep.host}":"${lib.escapeShellArg dep.name}"" >&2 ${decrypt} ${lib.escapeShellArg dep.file} \ | tr -d '\n' \ - | ${pkgs.libargon2}/bin/argon2 "$(${pkgs.openssl}/bin/openssl rand -base64 16)" -id \ + | ${pkgs.libargon2}/bin/argon2 "$(${pkgs.openssl}/bin/openssl rand -base64 16)" -id -e \ + | tr -d '\n' \ || die "Failure while generating argon2id hash" ''; diff --git a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@2171ec5b4ea361de.age b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@2171ec5b4ea361de.age index e03e325..75e6d20 100644 Binary files a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@2171ec5b4ea361de.age and b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@2171ec5b4ea361de.age differ diff --git a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@30a80c5c819a6d2f.age b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@30a80c5c819a6d2f.age index b13d57a..67101ec 100644 --- a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@30a80c5c819a6d2f.age +++ b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@30a80c5c819a6d2f.age @@ -1,9 +1,13 @@ age-encryption.org/v1 --> X25519 Fmh3QK1rauE4Yy1F9uvzGtMumQfTHPsZpB/mFHyTik4 -uQZQ9AeMHIDYKOdSNJDY8yyr+vmFvfJYLe0F7bhPDIs --> piv-p256 xqSe8Q Ap39opLW1MU2pC+UmNliHT/p9+Ktlh+Er0SBz481KE94 -iy1JR54/vixGF4KgHXq19vKKNlTUEtf7soKdG8jOnwE --> Qb{iiDl-grease e/(Ds5o{ -qixGDiCAz/9W5rqKL8H0rjTGknJ0 ---- Xb6CEtGUamg7Rlt3gImrGyHgnztP0C6ZvOVtS1pUddM -rKf:hT6^lm/ryҐ:!k/$)kdBQڌdOc+sCZwnP%4ƈօ".Ύ]}Y-Y`9 M3JQzo`nڳeĶ骙Zh}bE. D`]Z52:5L"`?f&RI&e~85j]7 uޮrfvXHKIƟ drp>#hޟ{G闗EHzgƪVS 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 index 8d24376..8941bde 100644 Binary files a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@39e88e1845ef6176.age and b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@39e88e1845ef6176.age differ diff --git a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@477075fe5513c902.age b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@477075fe5513c902.age index f31f6cd..03d7ebd 100644 Binary files a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@477075fe5513c902.age and b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@477075fe5513c902.age differ diff --git a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age index 886e18e..cf106ce 100644 Binary files a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age and b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age differ diff --git a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@7b098b000a97e947.age b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@7b098b000a97e947.age index ea25629..8c6039d 100644 Binary files a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@7b098b000a97e947.age and b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@7b098b000a97e947.age differ diff --git a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@b3ad8b0f0313feef.age b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@b3ad8b0f0313feef.age index f86263a..d41285d 100644 Binary files a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@b3ad8b0f0313feef.age and b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@b3ad8b0f0313feef.age differ diff --git a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@cde738bc7ba35556.age b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@cde738bc7ba35556.age index a2e789b..dbd484f 100644 Binary files a/secrets/generated/envoy/idmail-mailbox-hash_catch-all@cde738bc7ba35556.age and b/secrets/generated/envoy/idmail-mailbox-hash_catch-all@cde738bc7ba35556.age differ diff --git a/secrets/generated/envoy/idmail-user-hash_admin.age b/secrets/generated/envoy/idmail-user-hash_admin.age index f34c255..7a597c3 100644 Binary files a/secrets/generated/envoy/idmail-user-hash_admin.age and b/secrets/generated/envoy/idmail-user-hash_admin.age differ 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 new file mode 100644 index 0000000..69c896d Binary files /dev/null and b/secrets/rekeyed/envoy/0f7d8523c4d8a0757cf54379bc8c222f-idmail-mailbox-hash_catch-all@b3ad8b0f0313feef.age differ diff --git a/secrets/rekeyed/envoy/1b5d4ce27d2fc2444e991926c3b9e0fb-idmail-mailbox-hash_catch-all@7b098b000a97e947.age b/secrets/rekeyed/envoy/1b5d4ce27d2fc2444e991926c3b9e0fb-idmail-mailbox-hash_catch-all@7b098b000a97e947.age deleted file mode 100644 index e419950..0000000 --- a/secrets/rekeyed/envoy/1b5d4ce27d2fc2444e991926c3b9e0fb-idmail-mailbox-hash_catch-all@7b098b000a97e947.age +++ /dev/null @@ -1,8 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 rz300w CZ//VhaWYODA2wjXJOQ/+KUEVBUK/wEUHcgWwAokHDs -3xrPcXRvnyZc0EXnwQ0BdEXlhIUKIlcnD05IMBmEGGg --> O>P`waLd-grease Svn~RD c&N3jclb R=! y=IbV#Ix -FPMA/wSTJiTd1P76HlC7Br4yVj77356/MH2lZVkJpeh/KFSl3X20Ap6iL528TGXb -CQ ---- /VZfZw9RFXnpXzTAna7XINY8onqDPgFNwQqlT/Py2Sg -s||O.0`]5qnkъ0QN6]O+,Z2e{ϊMu3{Q1ou|&mXl@8f #>&4 :MR=O1?ˠIJ>t*? Ɣs=1]ds^f{iH3ٹNsy"x!PӏJո*tGk6==ZJIzd+؃s T1,d$su|PɽR[R׮q3ѳ/8=4 \ No newline at end of file diff --git a/secrets/rekeyed/envoy/239f1af6d431b122fe07891d57fdf9f0-idmail-user-hash_admin.age b/secrets/rekeyed/envoy/239f1af6d431b122fe07891d57fdf9f0-idmail-user-hash_admin.age deleted file mode 100644 index 1071618..0000000 --- a/secrets/rekeyed/envoy/239f1af6d431b122fe07891d57fdf9f0-idmail-user-hash_admin.age +++ /dev/null @@ -1,8 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 rz300w HoQnsVVkcyaZFasO5JXGHHxMBIoOSxupWY0tNreVeys -Wjz8Ns9/tue5JxMhq2MBC2iMhgLktIv2jTeQ5vEDo3Y --> D-:-grease _CE!K o4V x<\ YYr>ZN9K -BiZxrEOLoSFc2HmOmOKnqK7Vj7KxsJkKOak41Z8AX4HZjQ+eT74dVX10SuejC5ZF -DTGKAM8eGljUOwvbU7aghGuFI78yKqn0ncsieNAwFb4 ---- Wo9h1/P17v0i5Hb9K100Wpn7dtUNTW2M2rjNAb5RXbs -[RD+xAO3Aƥ%tD, ʙ{vBBS 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/654e667339ee8e4fd5c77e69eca3d8ad-idmail-mailbox-hash_catch-all@cde738bc7ba35556.age b/secrets/rekeyed/envoy/654e667339ee8e4fd5c77e69eca3d8ad-idmail-mailbox-hash_catch-all@cde738bc7ba35556.age new file mode 100644 index 0000000..b4edbf1 Binary files /dev/null and b/secrets/rekeyed/envoy/654e667339ee8e4fd5c77e69eca3d8ad-idmail-mailbox-hash_catch-all@cde738bc7ba35556.age 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 new file mode 100644 index 0000000..a93573e --- /dev/null +++ b/secrets/rekeyed/envoy/805f6240a14f705662e6494d267521e0-idmail-mailbox-hash_catch-all@39e88e1845ef6176.age @@ -0,0 +1,7 @@ +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/8980235762357e755523bd1e040cc577-idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age b/secrets/rekeyed/envoy/8980235762357e755523bd1e040cc577-idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age new file mode 100644 index 0000000..a6e9df0 --- /dev/null +++ b/secrets/rekeyed/envoy/8980235762357e755523bd1e040cc577-idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age @@ -0,0 +1,9 @@ +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/8b788b5e8f46ee2858a4b0593d038152-idmail-mailbox-hash_catch-all@39e88e1845ef6176.age b/secrets/rekeyed/envoy/8b788b5e8f46ee2858a4b0593d038152-idmail-mailbox-hash_catch-all@39e88e1845ef6176.age deleted file mode 100644 index 94380df..0000000 Binary files a/secrets/rekeyed/envoy/8b788b5e8f46ee2858a4b0593d038152-idmail-mailbox-hash_catch-all@39e88e1845ef6176.age and /dev/null differ diff --git a/secrets/rekeyed/envoy/98f465c979b3c50466d381121cd46cab-idmail-mailbox-hash_catch-all@cde738bc7ba35556.age b/secrets/rekeyed/envoy/98f465c979b3c50466d381121cd46cab-idmail-mailbox-hash_catch-all@cde738bc7ba35556.age deleted file mode 100644 index 3f3991d..0000000 --- a/secrets/rekeyed/envoy/98f465c979b3c50466d381121cd46cab-idmail-mailbox-hash_catch-all@cde738bc7ba35556.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 rz300w Z9bxq/m67wt27YLFMGDc/mRCwpOYWoyleE1kq6ULF2w -TC9+IRTAIoZyK4Zf9c3WO29r7Ofzey5oMXib/LmQblQ --> Gp"-grease hzbGw mS [pe -LKBfjRckJwOjFNHjltM/O+16s+K/tzItw4I3+JOCPQZ1eA ---- ygl3F9EOdj2RhG5GADVUbguGvWIPxvRTJsWHnT2hbys -6g :2{3RA*R0a‹\U@> D?d`;XcGg/{=æ~cx]n3xWtjy {ٟ6[ډpүI/7X~]͵Gr Jsd_S|Fs%XUy! -͐<@!jĒK14O6t] #7D%Fs#cH1~,N[+A'-yCюΈHW!hM c45LB&"L --0}s`!ff -Dm? \ No newline at end of file diff --git a/secrets/rekeyed/envoy/b9197385e28d009cf8ac7eeb1925f062-idmail-mailbox-hash_catch-all@2171ec5b4ea361de.age b/secrets/rekeyed/envoy/b9197385e28d009cf8ac7eeb1925f062-idmail-mailbox-hash_catch-all@2171ec5b4ea361de.age deleted file mode 100644 index dca84e6..0000000 Binary files a/secrets/rekeyed/envoy/b9197385e28d009cf8ac7eeb1925f062-idmail-mailbox-hash_catch-all@2171ec5b4ea361de.age and /dev/null differ diff --git a/secrets/rekeyed/envoy/c08b402e3d41e440971e89b074596125-idmail-user-hash_admin.age b/secrets/rekeyed/envoy/c08b402e3d41e440971e89b074596125-idmail-user-hash_admin.age new file mode 100644 index 0000000..5ee2bc7 --- /dev/null +++ b/secrets/rekeyed/envoy/c08b402e3d41e440971e89b074596125-idmail-user-hash_admin.age @@ -0,0 +1,8 @@ +age-encryption.org/v1 +-> ssh-ed25519 rz300w /zxd6xiJsFk3Y1rEluizvnO6eRZg9IqjdPG4eCgCXmg +X599Hr8EWRtoxULJbfygbH1/BQMa79t+95MPt4q8+js +-> d-grease V A2pPtX?2 0~ 2;##OG +INs/HVv7qaAE7KSrgFe2/8zdkDey3wIfryIYVwHXlAfGph4pMRIU7F5oiXkBeuu0 +TGK0/9If7cz1+CWPtXARaWboqYSYupa2gyNm +--- Qedqqu+1LKeKp5e5OJzIK/LSN7/WTKFCcbZZB36cSpU +Ꮩ$p쁭|fId;4C~P˴9HWK2#d-ʜv)w+8}3:=R#q;?{Ә2{( 9%>`}0^3wǐ(Z]:/]{< \ No newline at end of file diff --git a/secrets/rekeyed/envoy/c738bec281d57a1c1e7a8510949100da-idmail-mailbox-hash_catch-all@30a80c5c819a6d2f.age b/secrets/rekeyed/envoy/c738bec281d57a1c1e7a8510949100da-idmail-mailbox-hash_catch-all@30a80c5c819a6d2f.age deleted file mode 100644 index af03987..0000000 Binary files a/secrets/rekeyed/envoy/c738bec281d57a1c1e7a8510949100da-idmail-mailbox-hash_catch-all@30a80c5c819a6d2f.age and /dev/null differ diff --git a/secrets/rekeyed/envoy/e31e38256af974e40952071d88c6732f-idmail-mailbox-hash_catch-all@b3ad8b0f0313feef.age b/secrets/rekeyed/envoy/e31e38256af974e40952071d88c6732f-idmail-mailbox-hash_catch-all@b3ad8b0f0313feef.age deleted file mode 100644 index 6f5d54d..0000000 Binary files a/secrets/rekeyed/envoy/e31e38256af974e40952071d88c6732f-idmail-mailbox-hash_catch-all@b3ad8b0f0313feef.age and /dev/null differ diff --git a/secrets/rekeyed/envoy/ef5fc4197f5f066ec09387f4769f0cd2-idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age b/secrets/rekeyed/envoy/ef5fc4197f5f066ec09387f4769f0cd2-idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age deleted file mode 100644 index f77df64..0000000 Binary files a/secrets/rekeyed/envoy/ef5fc4197f5f066ec09387f4769f0cd2-idmail-mailbox-hash_catch-all@5b58b7c64bdf6ac8.age and /dev/null differ 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 new file mode 100644 index 0000000..6cae01b --- /dev/null +++ b/secrets/rekeyed/envoy/f531d53bbc7370437753b0113cc74f0a-idmail-mailbox-hash_catch-all@2171ec5b4ea361de.age @@ -0,0 +1,8 @@ +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