Merge commit 'caf1394' into development

pub-keys.nix

@@ -16,7 +16,7 @@
     ssh = {
       andromeda = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJy2VD362wUcu0lKj2d6OIU8dbAna0Lu/NaAYIj8gdIA andromeda@lenovo";
       lenovo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHG4eqsLTq2os2mxfwhys3BpVnowcJrqt2CbRFzN2pJb root@lenovo";
-      _109-199-104-83 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFD4kO9MhIHUiwYvX3VoFmDDTfWGesimrxUwFTmxTZ0D root@109-199-104-83";
+      _109-199-104-83 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDqjbjFrGZD98tAb8tnayeGjkcsJ17nAdREugZub3AWz root@109-199-104-83";
     };
   };
 }

secrets/mailserver-acc-admin-pw.age

@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 mT2fyg buCWpIVMGywNNngFQANXWWwzPCefsKayl1UHS3AY0Wc
+-> ssh-ed25519 mT2fyg VKndh6ieX+XzpTHBh+ov96IrqGCIQeYcKji5wt6HlXA
-DHaaAaFg7CA09npMxqdMPtGb/0IviAZyFYXD5ALsdgk
+LW+yUqS5KFWVTvZHAcUOBH9VS+FoFupqnzajU5nR0EI
--> ssh-ed25519 UHxfvA 9YSvbT4oL7BjoFHVqO0rZgqmPl+bKX7peEYRdptAO3E
+-> ssh-ed25519 UHxfvA p1bCzcd97Ra//YUnes9g6Q/qp07n+f+dDkaCNZiBpEc
-OFyyFmYIXYyRVoVWYrQgjZ0mz66Cr1nwVeriAGAqsPo
+ZJ/khm5EuOZj6OyG/JNP7MeyM6SAVAfnx6GkFULHXTs
--> ssh-ed25519 ZES6hg DKddux+yxF4N1dXATOT4hhZXIs1+ajE4yvzNR0ZUQlI
+-> ssh-ed25519 EL/Tyg 9AL2BfGioplxgC+Paid3OMpTxAAZ/MqgD2cZ9JGuNzM
-0e23BqxD/LrfMdbJPHuDfVnSbcnvEUHYDSlX60k/BoQ
+fY2puHpjjNbCUJpHX1DIoqcpu5pM/yxhgZxkSlJYMBw
---- yRcytWZZF7qHGvO5Na0fjMFzeDUdaVRgpLomcN0bKsE
+--- AnUcifoSL3SM3R+dKgldV2//mRjs6f+7t1v7xAEjUbU
-<EFBFBD><EFBFBD><EFBFBD>%-<2D>kf32]<5D><><EFBFBD>j<0C>I<EFBFBD>i'<04>^]<5D><07><><EFBFBD><10>gF<67>V<EFBFBD>r<>j<19><03><>&<26><>BI5P<><50><EFBFBD>1<EFBFBD><31>F<EFBFBD>[<5B><><EFBFBD>BG<42><16><>l<EFBFBD>j%<25>*<2A><0F>p{<7B><><02>p<EFBFBD>6<17>r	^<5E><>p<EFBFBD>v<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>7<><37>r<EFBFBD>L6<4C>TDr<44><72><EFBFBD>/<2F>E<15><>xȩ<11>u<>cN<63>J<EFBFBD>4<EFBFBD>Y)<29>]<5D>N<EFBFBD>Թ[<5B><>q}<7D>-<2D>ʼn=;2<>hI<68>꫎He<48>_F<15><13>o<EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD>}<7D><><EFBFBD>I@3<><33>)<29><>O<EFBFBD>=<08><02><04>

secrets/mailserver-acc-test-pw.age

@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 mT2fyg xKR9bPGrd4bpdJEiP2n51SrEsG7ylsS5/ewD9WBr2WM
+-> ssh-ed25519 mT2fyg BHPXb0yAMGIMJoEFJFzq5YQrlj7C0IyXcIKHtEbQmiw
-WMyKGvjzZlNRsujnuFU1oklcd+IZD4gv1C7/5reMnLY
+0ilGBqIPjzYe0l6N/PXdTWW3spJZIsIBC0B62wdutNc
--> ssh-ed25519 UHxfvA IWgm1Vn8nQEan2i9shbX8tSez/uIXTHDEO5eGXhLrSo
+-> ssh-ed25519 UHxfvA 4KodpMUl2mkRcsKY7EzoMgIeWQ0yqyW+NqQheyHd6w0
-e5uHHcdHru0zfhByA15AvOjhgoMqte/oaI1zkoUjjgg
+JMei4drWd0VG/qHDAlucoFtYlDAv/whTKrs23q9YX+c
--> ssh-ed25519 ZES6hg sy+1upJggjItuGBgOZmXQwmF7joSAw8JSzH90UYIIng
+-> ssh-ed25519 EL/Tyg Ip6g9rPqiKDUlmrBO+Bfu+VAi6rx90zUBxzbKupXHXE
-GS9GAZMT3hc+IfbUUquFaTM7Q57LSzxEUS95CjqB1Yg
+AK9id0HQqWPzNrK3AVox4vUO4mQlI/uZY7+ez8992K4
---- 4pW1Y7aE72Adf8Ru9YSB35gaTA0eoamnpyFlRLkBS3M
+--- rhCvXjaEy9bzdG5UTR6HcQvHfioEJi4H0BFjyrQopLc
-4V8 b<>Z<EFBFBD>@<0C><><EFBFBD>D6<44>eE;<3B><>P<EFBFBD>a)<29>	C<>P<>Љ<EFBFBD><EFBFBD><7F>?<3F>BUQ<55>V#u<><75><0E>hgd<67><64><EFBFBD><EFBFBD>~Nm<4E><6D>&J<><4A><EFBFBD><EFBFBD><12><>^SH<>{<7B>M<EFBFBD>RF<52><46>Tx<54><78>g<EFBFBD>ή<EFBFBD>y,<2C>ͣ<EFBFBD>O
+<04><>٠<EFBFBD>Jl<4A>O<EFBFBD>W<EFBFBD><57>u<EFBFBD>1<EFBFBD><31>ʀ<EFBFBD><CA80><EFBFBD>˱<EFBFBD>X<EFBFBD>d1	<09>[<15><><EFBFBD>||Bt<42>\<5C> <20>h<EFBFBD>#<23><>ѣ'<27>b<EFBFBD><62>A<EFBFBD><41>z"n1\<5C><>q0<71><30>a<EFBFBD>:Ѯ<>T<EFBFBD><54><EFBFBD>EG<45>
	b<><62>Cy<43><79>7U<37><1E>
W

secrets/mailserver-acc-zulip+admin-pw.age

@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 mT2fyg FckDPvAO+2LoXSeSdk98iOtLYddEJMdCuzUWHOuRn3Y
+-> ssh-ed25519 mT2fyg /YSp9eYFPJT5Vj1lkw19CfDCW8bauZ2b1BiMtdZKTnY
-gDxYp3LbyHuRIJRRr8Ax1nEbZvyzOFRYD22JuAZm91k
+sJL2tL8nmh7q/8raA6Nnha2J9witk3994fxyvGcmBoA
--> ssh-ed25519 UHxfvA Cbu32dAgNSi6rHk9sfmPkSB1TGDZipxlXO+G5mz9SQA
+-> ssh-ed25519 UHxfvA 68lyvttT185FSxrJLdAv2Qdb9/50Dn8zL5K5v7knz2A
-oU67uMNnAnrmFaC+IRuFykN05R3zfd1gvwKgt+BjA20
+hrT93PeA+zX+ilXUjVuNQQi3nHED/ksmY82x89gJxj0
--> ssh-ed25519 ZES6hg zovj1v3RgqL7ZzWvi9E4NN5ugdyNLXweC4z/F6544lI
+-> ssh-ed25519 EL/Tyg RDA+VpzH1QetDunca2R3KyzvBs0c1Hyp/BCDSGB+DQc
-MnV7cWUcPxvckPbbwi+DsFokWPCuw83pWu1Zz4pHftQ
+o9k3z0FO/VXubhug6eeSDRwed2zvu+pbWeed6cKOun0
---- zSHop8M98qVi6eCboZWh6j7zZCRNVQyJK3y+751Nd90
+--- 8dCuX7j1i7EiXtF6jILoMUt8RxxBXnMgDqvqp2uMSOk
-<EFBFBD><02>K<EFBFBD>t<EFBFBD>w<EFBFBD>1<EFBFBD>
<01><><EFBFBD><EFBFBD>3<0B><19><>l<EFBFBD><6C><EFBFBD>1S̾<53>>P<16><>2<EFBFBD><32>#<23><><EFBFBD><0B>EpK<08><>E<EFBFBD>{Y<><59>J<EFBFBD><06>^<5E><>z<EFBFBD><1F><>V)@<0F>V^<5E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><12><><EFBFBD><EFBFBD><EFBFBD>-(P<>O<EFBFBD>H<EFBFBD>$h<EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.<1E><><EFBFBD>g5<67><35>T<EFBFBD>oek'<27>nέ-7:<3A><><EFBFBD>XE<58>a<EFBFBD><61><EFBFBD><EFBFBD>pb<70>R<EFBFBD><52>dQ<1F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><<04>)n^q<>y<EFBFBD>EJ<EFBFBD>
+ˬ<EFBFBD>૳a<18>e9u<39><75><EFBFBD>*N$<24><>X<EFBFBD>V<EFBFBD><56>mg<>(Ê<>&<26>

secrets/zulip-camoKey.age

@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 mT2fyg WRvospjFKe1OruLGih6656ci9xufMEH4Rx0kva8/gQg
+-> ssh-ed25519 mT2fyg F5X75uA03GCdN5hiq4K6GPkjZOEGNxmZ71X8Gx0VeFY
-e1b4rePZCaUG2Za47DYVVGvXAAR+llIlllZiiHzgBsU
+nURLjoD+R284PtDudfVRVwByEP836e+rhQyggmZG5Jg
--> ssh-ed25519 UHxfvA 5P33StVyzPB+CTYHY5hHUfPN0sBzgIeFeWrc/VWBekg
+-> ssh-ed25519 UHxfvA 6hSu9W0aRzw6lzOg8VtnR19/byrMv3Ioc3dY/HQD3Qc
-nqcbiVZFgC+3dcpbC7OHT7XFDdZymWx9d3uLUrvVvi4
+bTaLokq4Gn/tpCM7b10ME5MPR0oR3QyAKmlhXlrhLJw
--> ssh-ed25519 ZES6hg wOuYIeGPeRa1uEcdsUfNEs2XepAPfKIHhPJNUx6ZPg0
+-> ssh-ed25519 EL/Tyg 4k+vFxHeqISiWexGj5IAvXRpWdheKDJ/8b9dy8EYVHU
-gVwyYcpH/LwXmhPHGLUXcre/FR2MTqAue1Azf5jESUc
+eRBAnmIxuXtgi7dVTHfH0Q9h8KsyrVD0tTK0PlXO0EE
---- 3CMHIF8A8YAKdSfyYOsGqk/BcotL9o8WzM7ZHlqcQuM
+--- ZLCSwwY0oD0L1nwBKhZlRmDG4dj6MdjXZFQoITaECDg
-<EFBFBD>DF
l<EFBFBD><EFBFBD><EFBFBD><EFBFBD>iY<69><59><EFBFBD><EFBFBD><EFBFBD><<10>S<EFBFBD><53>L<EFBFBD><4C><05><>jj<6A><6A>PЦ<10>Z<EFBFBD><5A><EFBFBD>t<EFBFBD><74><EFBFBD>xp<78>5<EFBFBD>
<P<><50><EFBFBD><EFBFBD><EFBFBD>g<EFBFBD><67>!<21><12><>GƂǻ
+<EFBFBD>oӈ<1F>l<EFBFBD><EFBFBD><EFBFBD>Nq<>[<5B><>J)&7<>`:޸`<60>׆<EFBFBD>D<EFBFBD><44>/J<>ٱF<D9B1>[<12><>A<EFBFBD>#<23>Z<EFBFBD><5A><EFBFBD>L<EFBFBD>y<EFBFBD>)"gt<1F><>*%4<>ᘨ<EFBFBD>O<EFBFBD>9Αv

secrets/zulip-extraSecrets-email_password.age

@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 mT2fyg CQp4TiQ6BcTSooH+LitGEl1sM/fVioJYwldMOf8zmmM
+-> ssh-ed25519 mT2fyg 6o7tjdOI24SQ/wAIw6DhF59ZSCY+5weRUxCqQso6PnI
-54sVzmMwQcl88oldP6GO3Ow0EjTAVYbKT5OpPN7FvE0
+1OdvoW2M8etjWYM87ZW2muKpNUV+iOFY8NCd1Wopjkk
--> ssh-ed25519 UHxfvA mReulyDzGyiUDawgAphxmsalWlEMXEsn0Se6bFPKKko
+-> ssh-ed25519 UHxfvA ksk6McR1jrkxTmGqMnkhM0b41+AZc26LoainR5CGmC8
-eWbx/QCT1P61UK5rKafpVCNf0zTKDQG+laK+FRbn+gY
+AZTynapDNQ8aLFx7Rcu3dLVxJnuKcb8Emak9SjEOQcU
--> ssh-ed25519 ZES6hg 2Aca/70YNAiqM9Rxhq9kYap90zYfwiXDNL+FIupbyjs
+-> ssh-ed25519 EL/Tyg ZQaWIGPt41SwnQpGFnAadZmC/bVuTJx2v15GMmqjlU4
-26GBrhF7aIMWnW5ndm64QLOXBbu04usQnQJ0GQKbgxc
+3/S32mze090ThCPZF/lDs3xvsaAKNgfrM7I09WUGtsk
---- vKsAZM3qvpU0NSm98JcnGHBYIRIiP7bXBRliRnUdB8g
+--- aRUPFhqwkRAzL2sQW4UJPPhV/EEvWCmXLE7PjHMLtnU
-<EFBFBD>
+<13><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>m<EFBFBD>a_VX#!<21>[d<>[<5B><><EFBFBD><0C><><EFBFBD><EFBFBD>s<EFBFBD>M<EFBFBD>!<21>/<2F>b[<5B>J<EFBFBD><4A>[

secrets/zulip-rabbitmqPassword.age

@@ -1,9 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 mT2fyg ql8WbEb0upNb8vi67sdsCHoU4AqGyUnDDv8uTJowTnc
+-> ssh-ed25519 mT2fyg zafxexSagQeL9Upbgi6UCWKIWN93OIViw3U/aFn6p28
-miQpsxN7uJAgvbzDV92zNE+iYJlfCzhiUSR6YlYv6Bc
+jEUjCPoCuIHJ1ICP8gkHj4kWQaTAhEtoS4QDJLCQQek
--> ssh-ed25519 UHxfvA c0B/trTLxmBtHjC/XXvdLVxG8ipAuy/SPtR3RJKK5wQ
+-> ssh-ed25519 UHxfvA UiU/MjBeFl7r0HIjMqTMSYGGa/S84ZpyEXMoyKhrMwc
-EbeCJJAlNZJD28V0if2hNfKrx+b5L3ry3neO9bCiEVs
+sCCXk319YR7WOd2YGjl+hgi4xk+yE7eyN9Z6I1qDu40
--> ssh-ed25519 ZES6hg a+efiHUVOHQOSH4xbAO4QL0OfKxbGtrpLAA/+/9xkGY
+-> ssh-ed25519 EL/Tyg 4YvWb6Ht4w6jtJZ7ROXzOLDIKjK0H5nDJSFADTcYiDg
-rG7U16hCSG/i3O6hhzqgWezJfHKntfvB7CpTTaz3818
+pDaPf5o6dFfE+J6CsEG4grI1DmBGuLCPcOys5q28pHo
---- +UoSwrL5gRW146WmG0fN6MbcFDnOw4LXka49DM0G8iQ
+--- rtPaK/w9Hla1apU/p3m+oORkmorylxOokUf64Le6A08
-<EFBFBD>,<2C>:<3A><><EFBFBD>J<EFBFBD><4A><EFBFBD>h#٘<>~y2<79>l<EFBFBD>o<EFBFBD><6F><EFBFBD><EFBFBD>]<17>w<>'jޫ<6A>n<EFBFBD><6E>,=k7<16>_<EFBFBD><5F><EFBFBD>o<1D>I<EFBFBD>,{e<><1B>uO˵
3<><33><EFBFBD><EFBFBD>
+<EFBFBD>-sN<><4E>}<7D>v
+lQw<03><><EFBFBD>
++<2B><>>Ɏ<><C98E><EFBFBD>#	<09><><EFBFBD>cĻ<63>&<26><><EFBFBD>u<7F><75><14><>(F<>S*<2A><>@k'(<28><>KzƳ<7A>©P<C2A9>K

secrets/zulip-sharedSecretKey.age

@@ -1,9 +1,10 @@
 age-encryption.org/v1
--> ssh-ed25519 mT2fyg ioFu/NKHKDtMHDbBB+C9RnsTfC7XNAGivomvwxdJpyg
+-> ssh-ed25519 mT2fyg 2nDDyTFBWePI5AQn2gKWA3bJRJLkdY642nO+lP3VHgk
-wbQgZJ5sp1J/Lv+MNVs1zdMCfo6jo6tEorRNTCW8TsQ
+L3QjA1urvUsFQ7D282BvfB2nRvDfQ2dDgPU//579Dzs
--> ssh-ed25519 UHxfvA 21tOMm30A/uKvcBNlrJnth2+uR1Kqt4T3BtYBCW8Nh0
+-> ssh-ed25519 UHxfvA BPbkHPRgQWlWfP3XdQYso1R7IWt/mXk00z6AKb1YeTs
-ud8I5kQKh9mAqWuyGMVhTRN6GCfsDSCPHqB9DMXPiJA
+uzUc7K+G3nyX6Amjab0nuSqUAIqze+qWzmhL4NWFv9M
--> ssh-ed25519 ZES6hg dmY4019lEjff3ojGTNudeHv9QObI2EhINzi+xPeOPn8
+-> ssh-ed25519 EL/Tyg oKcrvdDUPqVBFPKO5XtN3wHlS0/VQ65JoDf3BZHKNz0
-6TN6K5m6deDOMHPSyBXJvyqRHyOmgr9g0HaKFquA5pU
+nNnPODexacfxehSra59D/QSePJ0ReN8t5CVbOwRwuDU
---- 6lDuIjLGhP1jd87YBKuQ3yV7Fh4oUfyjxFn/Wc0195M
+--- yBSSTuxraK6ijWNnC9zJfIzrVHLOu4neg60ZvbFKyuM
-! <20>	|<7C>S<EFBFBD>o<EFBFBD>W%_R<5F>%HR<48><52><EFBFBD><EFBFBD>޷o<1A><><EFBFBD><EFBFBD>Z<EFBFBD>ֈb(<0C><><EFBFBD><EFBFBD><EFBFBD>9b<39>X<EFBFBD>J<EFBFBD>^<5E>{w<><77>3<EFBFBD><33><EFBFBD>P<EFBFBD>M~k<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڢ~<7E>Gȉ<47><C889>k~<EFBFBD>
+<EFBFBD>;||<7C><><EFBFBD><EFBFBD><0B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>e!<21><>@<40><><EFBFBD><EFBFBD>%<<3C>h<17><>D)<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>JH<EFBFBD>@4<EFBFBD>
+t<><74>J