From a9c9600b1457a7af4e89b3dfb2c95ee2629303bf Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Sat, 18 May 2024 18:52:16 +0100 Subject: [PATCH] matrix: move jorah->boron --- modules/locations.nix | 2 +- secrets/matrix/matrix.hillion.co.uk/email.age | Bin 1260 -> 1225 bytes .../macaroon_secret_key.age | 34 +++++++-------- .../registration_shared_secret.age | 36 ++++++++------- secrets/restic/128G.age | 41 +++++++++--------- secrets/secrets.nix | 8 ++-- 6 files changed, 58 insertions(+), 63 deletions(-) diff --git a/modules/locations.nix b/modules/locations.nix index b645a66..71dee1e 100644 --- a/modules/locations.nix +++ b/modules/locations.nix @@ -27,7 +27,7 @@ in gitea = "boron.cx.ts.hillion.co.uk"; homeassistant = "microserver.home.ts.hillion.co.uk"; mastodon = ""; - matrix = "jorah.cx.ts.hillion.co.uk"; + matrix = "boron.cx.ts.hillion.co.uk"; tang = [ "li.pop.ts.hillion.co.uk" "microserver.home.ts.hillion.co.uk" diff --git a/secrets/matrix/matrix.hillion.co.uk/email.age b/secrets/matrix/matrix.hillion.co.uk/email.age index 503bb711324987767b1876ce3bd4b34154427158..bda2453a60855d32e850de95e51c88095d52b2eb 100644 GIT binary patch literal 1225 zcmYk)Td&gu003amgF%W3CjuctLIwtj8OL^OcWELgY1ge?yKcR#Th|E3Ube1lcj?-- z>r_x;h~R_ZgP8cDAvpw45s5)f@Dkw#MM)$^0!Bp*5yLg2VC1MTCjNylpK3N|nmv6O z4ScKLd$d0^!5{(5%*H&gJu~#w7&+z&G!F>vE>0H)<#wO7>S6*iFtVC!6ClW7ktAVy zF$a$AI#P|=oE!PMWM3Y6%E-aPu&(o#iUOfbu^MN>Y3PubFoa6#vGz1Hw6fw0biunOUPAa4f^Z(ao&~7~u0$75v z6M~Rel2kRB@caQW8CK{@E3T7im%?f(m}tTj1{d;~0_YgIUeO-5n0!aeV554aBm?Lq z94}P8zqAHb>(~Cx?qc3 zs9#NLGGQwXJqUViU9<^Fu1{#MM01m%laLUH#cCacku2S0dYP!fX(JA9drg66fYPuu zV4DOU62_=X2^MFDWh}sI8tOuFkg}MJ50#8+*$^;XEJa0XLZX6HsuXO$6N#xVAc3f& za(zCjrrTT!vds3N2!;P?H;rT}l|W-w-708UtnDB&COI}M@fthAd@xFbHd5kws?yES zY`rpRQ907<2!aPpd;`qmqSaA4ux2(?o}!sTMp2+Bk5`H8$VHJ+RYWFgg9T=0W?~T^ zNA0A*<8Z&m<9?iH!EUjNWmANs$6Kc4m&|-HV9Q?52G+0LC0`ZqxHq?N`2Mq7=d+J2 zJ78b?nto%)4ej-MpK3>E-NCkv4tZtyPHX9^6JK2@UEBQ2)HD0w@)mZT{ul1x^y_fKKR}_a)tQt%{q2Qy>In9F9}EgoLaNy z=$Tb79IWiR{`AKy3i34da(1h=SfAP=j-OXI{TxHDbI0aiOaEFvcH;Drg>zF&F1~da zeB%6txijJBt;*c)jc3EV7d9PwYSrcMX6d{0&z@U%>h`>8tXMd(_uZv`ys~Ax_uSfT zw~ukRn>W&Pd(6Y_OaABjU&l98uJ*=H&fZ&#eYh7&uU|d=__93*e>-_fIrPEhi#xCW E11LwviU0rr literal 1260 zcmYk&`;XHE0Kjof2p4ONNDy)+>S->bnY(U%uE8i>w{_jt$GUZEmm{HTyY;bW+pV_= zB0r!8k$6!P5Z}N>QGdWU28=NvkTWqM0Yx4vkq{1#s6>H8g8GArf5A83k6JgvMoV)C z9p7rVCfaTt>_>s{BV(RthFwn`qo;&aCJ*RTyMYK&P*o#*s392)Yg=|CgW8w&YFWtp$8x$g<~*@BW$K^DZDEih>%H_a;DQpn#mrb zU^c9z2Hgx@Qp*L&hdZ+A!myaLGSxul7@*Ez1+$3ujdludh;agPD6wcJ-E<=Z^<|i0 zyAaC9lRRz(3C;!Ksb*G=7E@dgZ+7jnAv&E}&t-FT zHx%V#CAyrZ2gQ^yfV@bj&n1evUd^adl^Es%h#pT=G}zVSy^tH2c1)!}E%?87mS~ov z0T6doI~8vQ`7|k;TtceXaa08pm8{srLTx9Ts$xMrATpBJlxq!-O+?wORF+K-gd-l4 zv;Z{&N@B4s!EK>Ir3bj)O&VZs$O{-Il2+7b0=8f|d?FE#Vm%v?C=l{l(jxh8jwk-v z2K=(2fqJxT8gP~n`5aM2qEcV0c^y;LoG#rMD7M8$2ZI4j!gWQr5KF8!+(IeeBNU_T z0%^`L^ZpEffUgL{AQ`t_PS6VHp^(Sm}0bqnv2zH_Ee9g2NVo(QfSIj8;HjK zTbt0<7?Fwlt#I8nRL>aWbkCM2b-)f`eN$tAa5y|xu<3qIr&*jzCgLVv(;W)RNF1KZ zI2KU^E!`eCwN?w)sX8!siXh*5_r)FPuFGEq8H_%65)J#b>#!SMz86-zd9 zubfp2FCW{t=eO|gE8UxpU!NbJEGT~}tJgfZomja3%5-@Cb0qjwIEFsG@zT9}y5j8j zvu8I~4^?-)ed77)k*B`gykmUjnb+?=|8a8Xdl#-hdEn;-^COKV`)_+~^vuQ6@~TC< zm#%(n>w;TGMz?H^!Eaus(I0Poc=Ul!9(v>4jfsWRGkY(d-1cyw%^VuX)D^F;J$rs~ z(^{FhdGY8A?RTED_lIV8JhRn5_s3tO_(%6#N+jlH9A@|X*Osiha3qe-?HfOQjn3X- zoSIq5%kuGWO?(jy-&*;_oP2b<-1~LcGK#v&UcGDi>}S>!m%pAr%>H!rbos>Xxf|=| k=p((8#t-XUQvdzn7aOKO*szx$S-d>EWz)`YW?owVH(>YCeE ssh-rsa GxPFJQ -j36S9K1vUFeNZxh1l1dea+8KqzTnLqR3beGzDGmPSljkTPZrRs9MSsSwuAsH01Zh -95mfzFBvw3y7yGWgcW0NyGeiZ/NGvqYzuplqJbCXf/5Zwt9fnwGiWqIUZK3pGDvt -bEoJwfdTPPGgGH6egm/n+uZw7HuHklJtDwygh5wQobhsfu+q44JeaaC6Dg8Iu0Fs -ZNj2tJ1LIts0bsmevnJveOTXNq3TcHsPP1E3kYCt8OPEfPjx5Y2Ajba+VmDATDN/ -5e6ncNOX5viA/DnlfL1Kx+1kf8A1wKJSNnCd0zPIDhDlagdcbd88CXdQPmPUuesD -qdUDplc+FjnCxkWrJPHnnQ +oP+PAtaEFPKwY/p94ofdBlLtCJDzaOkE7jblE4COKCp6NcfjUot7a7G2rSzG3Z9A +cF3HcuKsMrG2Tth4ElBB0nwfaXUJZOBO3nrZaU0RGBBkxqooDVV2LzA+NG0HpIZ6 +8Rd/Ch621gaBDYbSNFKLx5pAotqsARt13BMVY9nuifNGmWAamZ5UsJwZ/OhxKC5i +bkFZGeHZm4tilpsBEnh99PxofQmFy52AQhpx2UZETaD7yXvyEQjN9yBVKGhwA8Xs +xIRZLVgCbMv5lroYChpj/SiuoNhuaLo+05+3r5JnL/ODEl2dYZHkr2fAo31QUPnr +kmir2Nwoq4MlNELjQvSfdQ -> ssh-rsa K9mW1w -Fkzo4emHSiZilicSPgihNC9DjuNMih0pG9gjPJFeL6z3i8vzb2Wlr47Hs3RX8ccd -GUu97/g6Pk71STbZpq0J694lZLlzRrQiAoRD+nvbwDyiY4NThkWGwJyrK5YVsXb9 -Tn8koBMyWAl173UZBfX9/tZbV/BgibajNYYUSOYqGPTtKMO2iwZi/f5vNP2Ss9Xn -a6xV3A9uJ0iQd1HFXxDqoy66KsP4cJX7U+cV4jPp0dcdAY/umgVcWnhAVRISiP0f -qLMEW6g63MXeJqij1vVl3WhEXqa4AZHGMGuHbWfuRhES8TVVxkslh6S1HnrbQq8Q -5x0sR+jPHIHk2ZJ3QLWQsQ --> ssh-ed25519 Qo6/7A AgI2XGB68qmD4HsNzLJlGMOI8RHag/CyOOPgJNZ5Vgc -Oqto0uatJOeVEY6ON8jJIbNkGy96KJOW/HHvKqkKT0A --> eG853-grease Pw3j" PcU:Uj0 -qf1JY7M0YjgzXs73vuw/gwnTut46 ---- 1wceU1/J0KK3A4H2iTKGpPIGIv6rbawHYerjWYeNYRA -+ayz_e_J=V̗D4nW4v%=>;lAva~__z숽U2=U?Xjd%1jGMkɒ#^*jy+ \ No newline at end of file +GVNgJY5cse7GnU0UpgfBT2a8Ev0KeFC+Tfvj8Jd7Wgu7pYv/DlwIumJN2NcmU76S +zW1Z6we+Fs4DO83v+4Bug4d+m7oUbKxbUfgIDE4MDEkc4B/XUKv0Ex1VaO4lGh6h +0lRF4PO22OjyO4TT4tkLZgTAStq/vS20GhluEdVPp2ovSsn7KYLwmx81iBnfNDbm +0uEKAE2dj01BHSiRZ1rVj9OnTacrRpzp6mbVJxZqkUMJ+A/tMp1B7eTjWiGhUUGs ++de52Ba/ww1jM0BmbdemWS5SA1Kch1ttgnSFKIh24tYyRxX4AVsuYqPkIuH8+W4O +Jh0387AJaR+3+Tvweo88Tw +-> ssh-ed25519 iWiFbA xx3oYrX6/Z1srbxmAztZV5AJgYZn20UMvRnn4qrSoAU +98oe26dqhSE3eET7hwdV/jJTVu2ldBiZ6ysabwK97Co +--- qrw4HhyaHrpDmws4EoABLFF3HU30AaZFCt4qHKo6gUM +OnCfIQl@?:5  m*63gtjhÛA8 ^;Tx%;O׶YoG,m s8P R\nXAw;XRM2F \ No newline at end of file diff --git a/secrets/matrix/matrix.hillion.co.uk/registration_shared_secret.age b/secrets/matrix/matrix.hillion.co.uk/registration_shared_secret.age index 78564e4..bdf8658 100644 --- a/secrets/matrix/matrix.hillion.co.uk/registration_shared_secret.age +++ b/secrets/matrix/matrix.hillion.co.uk/registration_shared_secret.age @@ -1,22 +1,20 @@ age-encryption.org/v1 -> ssh-rsa GxPFJQ -PcYDtUs6evvvrjU3cZxaEoj62lvEyRQI4aGvGFK+6E/5ROwjBsyv7g6ClxDOICNU -CUHzDYtbepFIycvqGGm/TDk2ZDknjpcef/pC2MjlPk+WZDkTx2MeNQs6uk8fNvS5 -6Ppw3CvdiABcx3NFUrgh/N1NKsvgGCR621q/AkyjodUdjWwTxYbr3XnZVA1J+S6M -Nj+1RGYGBRGvUYcC7JIqArLZaCjDyXlyExtlCzlux8jUtblEBBmuwDYjMjUNE4fB -Qq7D0RZW1AiaMqiFuzB03l9+n+NzYtmWHDWpgZcp1mbTWEaGWvfSI1xxULjp89Hx -+3GopFzQpknChP+KIGWCIA +XtQerUqo59DoCzMSSbYWK1fZR5uPzA20NJcpZ8YOCD2cPJvGiSN4ePnPLSSnyUAV +ei45c6sdRRRZEKcq/uabTWPqk1xymKv4CrLn4FjS9VviKNYW0p+oo0J9ummwE6sa +/REKRIQRrsP1HwSO0gaq6CQEyGr9NouybuDDS5AIGpvaRV9+F1Htc/Um5JmsGaeC +aUBSJdZGnUajg/NN+QBlhhndT1PevFNKaviOJB4ghZUv8V89KZUhZMLuWQHVSr6D +fPQLXCI7mDjv82rydG5NWzE3OiMycLlt3AXWE97G4dhrtQGMPb3KDeGaY2mXBQ5G +Qq+myMZJqx9LbQWPyBgLgQ -> ssh-rsa K9mW1w -ioNuiJFlFdVWMmAHlocThTlQYIn0m9I85WZjtbXbBGaV6B7WPVJOAfj8dsKAx2a+ -E8kq3Ffc1iNfcnw5gBb9X9zXReyi1cdSsdjwJS8Wew2was3rcbcRBh4cL+bzZ1U5 -BOkUqWo8lF1PNf/oJyjK3y07br8EKcjDTMs+n3AkjGTLyyP2Li2ZwzCHCoKgyHxf -COcFAFWQdli4fZon9KjZ+Je4UtPtyDEKUUZxZMxXsXd4OTs/cpaFpzrl7MpB2Qdg -31x0SQbY7Vt7+88yFoE55NmTTDPtIj9A38xSn9HBGHDl8+nftXTnkoQa+E2gJ2V0 -LYeWbozz2zFUQiUsQhM72A --> ssh-ed25519 Qo6/7A h+m0fzmo6DpdSejGvgcrYIuQFM0My3X+Vk4XvwlRyDg -fWmR5VvANbi8P2zouqz66lxx61YzcW9R6wQLZvh3Y48 --> Z#,x-grease ~ts -zKs31SssQzG0GYI+xfHhfC+0 ---- Aa0oGbJedOyry0m22fwH+VY5koBC2NO7o4OwIQe6YlY -4 -vO? -n.d CD,+kr>di84 \ No newline at end of file +QjWGmW/CSl1+xidbzQ7rBjPI9gphRAqC9j4dTsQmK48WlnlG9fAX1w7s8zJI287c +VwtOndfP/yYe8zj14IB0bn/efJ4s9DXS1toSVHhHMXGRYNx4LZJtGrHPEe7bmBDR +g3m6i3dFB48o4niZwLFmsTWD8KpYFPRmGnD9AX7cXtA1KzjD61ebb7dsjQ0J7/04 +QLUmPUJ4BMgvMhv5zHfjq/LjasrOVY5QkKi95xYVREacy9hp/5COs9d0d40+qLFh +QJ2CuiOba5+aYnVWtbq63F9YJsAwknPOI2nV64l1BflQGJjec+wS4LPi4+l6pT+0 +wPStv+iVu5vYdVNuq7KtnQ +-> ssh-ed25519 iWiFbA Qrs30RtQXXEglsSKQbmeLhZvQB9yR0EbKeba8IV1/wo +o89IKeFH91zdqfRJrIge0Sod6k+66BbN3DcUfnqSgqg +--- zhvOvBCbfuhWDejcJcXxtdypACwgPb1KrqpsNYWiKNc + +<}:2bzqSYr掑u} ub\; \ No newline at end of file diff --git a/secrets/restic/128G.age b/secrets/restic/128G.age index 8c7ec30..087851d 100644 --- a/secrets/restic/128G.age +++ b/secrets/restic/128G.age @@ -1,24 +1,23 @@ age-encryption.org/v1 -> ssh-rsa GxPFJQ -EZBFKBAzoSqlSaMvehEGiiCXaT7qhewJy1v6mr3NVCvQqTck6STzEBoalKDi3mIF -fLoX7oVMEh5bgOkKIYBiv00ueHe+osNCJtx/dHx9X462RXixrcbIqdPCD+XS0puZ -CxaohxNu+kSmbtZc9pZ8PETZ93dmCetSIwo1uQiGJChFBxNn7lm/fvOPvdN1821i -ougijCL+f8fG/fymXnnlULbAdyhUI+6Hx2WAP8v9796XQHBieKJJfRFVhbUGRKD9 -1AK66zZClZ1dD8SuZBtCnafrVm3Wjwys2aKgncKdrWuNoScWoZNiL4nS55w3PCEN -U2Jq6smqxjPdC/18xuBiNA +S3ctNbWyX1A6JQIN1vNnZamNMMYK20sP5Fv8P6XR4tlrM97QRcFujN6FM3a2siI7 +/bHryIpHu1cdK90qCLbIvyYm1lilTrXiN1JIN+4sm808dqinKwUI+RF0B+JzTbLW +JaITpkJubkrudALAoYARWBRcSkBRSnZYfWBIqDyuj42eGiqObTZdw6flA362cplX +j+XaqdyrISSsCq+nH22zpNC62MdwYKGnBNkao3ICZ74lYOdtjPE3FrokGkt1Hllm +AqZaLcYUTBbBlysrf8YlsAK9AvtdRHtwACcBv0YrJ35+HIJP7fkAWkfoCqD6iCu6 +z7XHv1LrtMY/HG3md8hV9A -> ssh-rsa K9mW1w -wYSU6EnCqBEQL950d/suDPPmJmqiPWHX0GJuc37bYffJTCJIJKthk43FDOWrcgbD -vsfTjRkzRZY8H6ngTTlwIuECzoJDhLq4/4n69dOi2Uz8XZvD9y6lPE7qmqClMziZ -mtheoib/PVoV6OvPnCg+d52HfR2REuQNHxGhNucDOjmL+lcjYNqrVq1IHhZJ0WUh -4+8J5kA17yFtdnLuIcIPdVNZ1oI1Y5E6H+fiJhje5cnEJ7u/GQAFRLmdV36cZDzF -OaUap/nxyAIjga+zbGptHjvKvLfWL+5EA+H47es6xcpJfadBuq0+AfTlSvsQzrqj -15xCp6IeGXJeZCOF3NchWw --> ssh-ed25519 nWv9MA k5cpWIDL6sNwqlr9dx3KBd8SXW4gwLZwjUPD1jqL4VM -xkDd8nnNoZNOPxIMt2iXvOVjUXxPcBpI0KD1I4p40p0 --> ssh-ed25519 Qo6/7A 7eJXxyASGk0iZu7o81zoiIm33IILsL9I7ScDXARPXzw -L0WP9V9nkRUvLXVVWf6BWf2GR8xvEI0LkDDAYOmGqLE --> ssh-ed25519 L5AKYA h7RKESPZ5k1wt67mErHvfWBpXY20mTVf/rMsvEcnb3s -xoHeghX8qvq2A9LYQpH+jna3Qr9tegIkTI/RhcZFXig ---- EwX1bjkJInYJEdM64ZNnt4UfwXAHcAz6ce+eBU9ORC0 - -@lf}40ur *'n%j=Ւ"÷;y \ No newline at end of file +fv366v8Yl7JHgYP6dyy9CMDY7KtjTK22WZed2zRTNpK4Z2lPrhPkMSahjuKCOtg1 +dPw2/mxHL/765f5V+ayGa3OxGzVfycmsKfTWhEBa6AcumVUTXCXk9i0u8MkyW36n +RjSd2wAPhXXt/RJUg0OQ7GB5ILY7sy/z8TGByMIWKUfNqqxJeBqm+D6k4kMjOkx4 +/S0JEPFpC3izwVjjnQh+NX5Wm9qOVNViJcCJ/+XX+ydK1uloeZjDvSs1E2+/xlo6 +wC4hsIBo7qQ9Fi0XIyE0UZiuLLtwozNEvctIzYOLMgqprP/zVgvDMc/qIrxN6ZzG +zC/n6bzufZ1v/wkyQZVz3Q +-> ssh-ed25519 nWv9MA YWPBSHvP1thV1nTOqv1dSLD3hsmwAoPZ3ha8uyy6ciw +lNiy/gXYtBwMqwPu4kKHPXmA/t/iQ3sYYtZFO/kwB0o +-> ssh-ed25519 iWiFbA K/RtHtowVbVOFjciimyV3qncJpGdXnlgPu2wydgbZC8 +RE2ZIl7Huu03JzI2HnzPQlXOH1lCK+Gq85s7ZGQoKOk +-> ssh-ed25519 L5AKYA QeK0d2kufo23d5gYcyz43ZZJG/r6ehro6aF9VIiVihA +D2UVzyBu/ZEgXRvmosYS/EOGFSWVaRANQnJgue1vFzg +--- xS5J/VAzbw0OANF+qfcLIqcrtLpXkRct2miWOIhM+Uk +[i,g-Ey4*&'Њ:fQa55 zCާ A \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 404dddc..e012e62 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -70,12 +70,12 @@ in "resilio/plain/sync.age".publicKeys = jake_users ++ [ ts.terminals.jakehillion.gendry ts.storage.tywin ]; # Matrix Secrets - "matrix/matrix.hillion.co.uk/macaroon_secret_key.age".publicKeys = jake_users ++ [ ts.cx.jorah ]; - "matrix/matrix.hillion.co.uk/email.age".publicKeys = jake_users ++ [ ts.cx.jorah ]; - "matrix/matrix.hillion.co.uk/registration_shared_secret.age".publicKeys = jake_users ++ [ ts.cx.jorah ]; + "matrix/matrix.hillion.co.uk/macaroon_secret_key.age".publicKeys = jake_users ++ [ ts.cx.boron ]; + "matrix/matrix.hillion.co.uk/email.age".publicKeys = jake_users ++ [ ts.cx.boron ]; + "matrix/matrix.hillion.co.uk/registration_shared_secret.age".publicKeys = jake_users ++ [ ts.cx.boron ]; # Backups Secrets - "restic/128G.age".publicKeys = jake_users ++ [ ts.storage.tywin ts.cx.jorah ts.home.microserver ]; + "restic/128G.age".publicKeys = jake_users ++ [ ts.storage.tywin ts.cx.boron ts.home.microserver ]; "restic/1.6T.age".publicKeys = jake_users ++ [ ts.storage.tywin ts.home.router ]; "git/git_backups_ecdsa.age".publicKeys = jake_users ++ [ ts.storage.tywin ];