From 67644162e19c508ecfae2ff961c104200c0df076 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Sun, 2 Jun 2024 21:39:07 +0100 Subject: [PATCH] sodium: rekey accidentally ran `rm -r /data`... --- modules/dns.nix | 4 ++-- modules/ssh/default.nix | 2 +- secrets/secrets.nix | 2 +- .../tailscale/sodium.pop.ts.hillion.co.uk.age | Bin 1007 -> 1006 bytes 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/dns.nix b/modules/dns.nix index eab81f4..e33d3ad 100644 --- a/modules/dns.nix +++ b/modules/dns.nix @@ -49,7 +49,7 @@ in lt = { be = "100.105.166.79"; }; pop = { li = "100.106.87.35"; - sodium = "100.82.135.64"; + sodium = "100.87.188.4"; }; storage = { theon = "100.104.142.22"; @@ -76,7 +76,7 @@ in lt = { be = "fd7a:115c:a1e0::9001:a64f"; }; pop = { li = "fd7a:115c:a1e0::e701:5723"; - sodium = "fd7a:115c:a1e0::c701:8740"; + sodium = "fd7a:115c:a1e0::3701:bc04"; }; storage = { theon = "fd7a:115c:a1e0::4aa8:8e16"; diff --git a/modules/ssh/default.nix b/modules/ssh/default.nix index 867ba9c..bd093e9 100644 --- a/modules/ssh/default.nix +++ b/modules/ssh/default.nix @@ -46,7 +46,7 @@ in "li.pop.ts.hillion.co.uk".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHQWgcDFL9UZBDKHPiEGepT1Qsc4gz3Pee0/XVHJ6V6u"; "microserver.home.ts.hillion.co.uk".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPPOCPqXm5a+vGB6PsJFvjKNgjLhM5MxrwCy6iHGRjXw"; "router.home.ts.hillion.co.uk".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAlCj/i2xprN6h0Ik2tthOJQy6Qwq3Ony73+yfbHYTFu"; - "sodium.pop.ts.hillion.co.uk".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL8+wlWyo1N58xrQ7HPdFC6Jeut4UYiW6Q3rpILzCaw0"; + "sodium.pop.ts.hillion.co.uk".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDQmG7v/XrinPmkTU2eIoISuU3+hoV4h60Bmbwd+xDjr"; "theon.storage.ts.hillion.co.uk".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN59psLVu3/sQORA4x3p8H3ei8MCQlcwX5T+k3kBeBMf"; "tywin.storage.ts.hillion.co.uk".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATsjWO0qZNFp2BhfgDuWi+e/ScMkFxp79N2OZoed1k"; }; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 46e3b69..858c230 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -22,7 +22,7 @@ let lt = { be = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILV3OSUT+cqFqrFHZGfn7/xi5FW3n1qjUFy8zBbYs2Sm root@be"; }; pop = { li = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHQWgcDFL9UZBDKHPiEGepT1Qsc4gz3Pee0/XVHJ6V6u root@li"; - sodium = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL8+wlWyo1N58xrQ7HPdFC6Jeut4UYiW6Q3rpILzCaw0 root@sodium"; + sodium = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDQmG7v/XrinPmkTU2eIoISuU3+hoV4h60Bmbwd+xDjr root@sodium"; }; terminals = { jakehillion = { gendry = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPXM5aDvNv4MTITXAvJWSS2yvr/mbxJE31tgwJtcl38c root@gendry"; }; }; storage = { diff --git a/secrets/tailscale/sodium.pop.ts.hillion.co.uk.age b/secrets/tailscale/sodium.pop.ts.hillion.co.uk.age index f1f2264db1d9d6ecb9d35adc98d46639e59ccc89..7ae5a4411318212040f7cef4a65210e44ee8b67e 100644 GIT binary patch literal 1006 zcmYk(yX)h0008ho^f04{xLqfgP}4Nc`p(9y|B4@B_>1s4%<5(GzG1a%So7e1du63wF`Xr`(=mBq7VlOO{M&7YgK?Q!0; zhuO_#%ZobHB$2<>JcrJ7q1L?ux2CbPu085ioCGEw8(H~G`Xn)EGNVvT#34Z+F6m@6 zq7|?e$clX##s#4m>cL)j>pVEw1AAmD3TNb@XOM_sGv~5_H<^@^NZTd*tUr`p;a}oT zR&i(q3;jx^b~0+FbFSFXffagP9c4y4u@O;PO;Cm>eaFIlP9wpFEV&{*Tqf@9(W^r= zLGDO|F{z%EwST1KQ)kw44%{6>OwQRJiMY?Jp|!=@0oGOvcb&$a&isz3o4ue!J-UDt zE@U$c=g(!pnip4AQNI@q)Ar%9Q>n;w8>Q7k@;WjI?>ZxhdDZt2ROBzZbOxpbjc~kC z(Nv$bRH}TJlcRNLB>&fzK<=O;bfn!_Z{pEW^B^NSvShC&B1$27<0C1iC>s=HoJX#* zrH6Dx3hYEZmy1AN>uV!if-|J<)$y|0ptj7{+eN%^HKFn&kKU$(d~q~(0AxAH&aNx7 z?H(W*+b5@_4jmjwZg6oJDDZD+v0-wUC4Ic-dYf504nxxe6?!Y~kS2Y}7(@^9Of=YO z!tojt3zNE9rFlibUV_vJu42GM>GBvA_`2c6Qeaxly^$$&R~O(K3z*R+QxPy2jvwTO zzrlDZiX02k^Cjm)aV<8bnW|mnRPa#uz_=#OwKA;6^G8_nWU_7BU9hP4JAttJfBTOj zmi3gc(YfoUFtoZ!v_y$qyogYIp9PBqu}J+t?I>L0I0|N^L%0+@%Ss6kJA!I*Oz2LE zY$7a$2Qtb}1H)^jW);hmwZhQNK7&rJ69krlj#DmP8M9RFBYfbMra}?h#Dszvku300 zV`nPRd_JGiZI<+4wOVwo&r>*_Dqyv*1hqxufdH}TBJesmjvJ(=p!cxZH};>m-g^7> z@25KtKkHt7`jfxEdid)Le^jqL`1!-Tcb!)Xad{=wzhwj!RFTP)uU;hK*iCQ}V literal 1007 zcmYk&xy$PW003}Z==quBJJf=Dt7|d5DT2!ke6& zT@)OB@Njfeagxv34@3~eV^MSw{1bjZHwx!r?pI^c#Mk`ZwThq)0p>5w>iRsdYInvD z8Yk_59a;Dr1zw$CTvftDBJ~`GiK$}bT`%p3ff#bBm>9-kg9xGR!rcX-p<$OI!pefO z44`CI!kJF4-IisfqZ)=1YN<)$(Sa=_Ua84(zvGvuR2!!*$((bm+A$3$7bLHjUTNY0 z!VIA9=SmV6N+(!6lx7mQ%ciQdPD6zRJKN&&9Y~|W%3rwGeii$yLF)U+O|f{5kpOru zQ_bj9ggBd66)y&2Pf~Owh~P5Gz1U9^dA;>w7z7s;wui;ZNi0XF1dElYElx#%DZ#xi zUge_07}pnZ-^pwf&)4-Bx4PbwsjVLAF+yxI#5IR=3tp74Y=d!87r1U#0;8iY;6{%z zwc&f_Bnp!!U#S0Y%jCsGdO)$sV>FQpOkSadE??l#F~*HvbP`tY8k*J`cz1wSv%xONFkM_EI%v!(XnnijAC*5b-L_SF*ouq663`%M;ou zJ|rKK;C$IT@&eBZW?l_DE$;*@p~t!3Z1K$ES{!bwlLeEyM;e9sxEa=pFBbJ0m z2@=(u1d{;{6YH;+*g4*t5Tp*dc$^%)|8F}CP#j0dnZli<<8Fq>og-6rA+(&AYesOu zW1Z_!ULEy(QSfU6JXMyfOLTe#C@p5&94R22XY?hz=l#GW6KxextcdX2OFMdDULX1> zg@O5eK9kqsK!V%8J5?F(2@3~9r|XI+qeC^63Dh`Bl`>`EoO=p*_3?+!^WQ8!{QmaA z4gcd0-#+%myRU?=-8{$sbzk@yed|_u@zbv!ef|b;_vKG7e}aAX`k#M1xFg@WeV=*r s8U9}Ri+R8L`{sj>pZ)#U-yXe3eyuzmCQpcOKlvT-(Np{J?%@mn08)}zMF0Q*