diff --git a/justfile b/justfile index 4e8410aa..04617953 100644 --- a/justfile +++ b/justfile @@ -7,3 +7,8 @@ update: build-wsl: cd ~/.local/share/chezmoi/provision sudo nix run .#nixosConfigurations.wsl.config.system.build.tarballBuilder + +[working-directory: 'provision/secrets'] +rekey-secrets: + cd ~/.local/share/chezmoi/provision/secrets + sudo agenix -r -i /etc/ssh/ssh_host_ed25519_key diff --git a/provision/secrets/borg/rsync/id_rsa.age b/provision/secrets/borg/rsync/id_rsa.age index f1fef90b..d97ccaff 100644 Binary files a/provision/secrets/borg/rsync/id_rsa.age and b/provision/secrets/borg/rsync/id_rsa.age differ diff --git a/provision/secrets/borg/rsync/id_rsa.pub.age b/provision/secrets/borg/rsync/id_rsa.pub.age index d3624ffd..544d5363 100644 Binary files a/provision/secrets/borg/rsync/id_rsa.pub.age and b/provision/secrets/borg/rsync/id_rsa.pub.age differ diff --git a/provision/secrets/borg/torus/password.age b/provision/secrets/borg/torus/password.age index 470d53b2..95b42f5a 100644 --- a/provision/secrets/borg/torus/password.age +++ b/provision/secrets/borg/torus/password.age @@ -1,11 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 Fz/sQw g8t9ix6ZdLNLGNY4noDSgb5III53qhoZRuhTNZ7jvFQ -1Zk2DEodffuq591LS7rgNH0PsyAYXtXXer98SbYtLs4 --> ssh-ed25519 47GzQA uMHbTf3ARjBNKTYmDxl+hIMUoNr6xOYf1HLXLSDLfRw -orTux6niP1R6MJbs1KAzJ1RotFLBgMhWIv04kSTqv1o --> ssh-ed25519 wcI7nQ JJEvWbPLX83N5v1HiaFEl4IhW65I4GLlq63YbTJQRiE -vh9YThFavYXvUHO7vVWNZPvJ0z3EcMteg+N5d+U/xSc --> ssh-ed25519 QjdSCg OXh2zsxGy2MCXMfOXWQ58SRq9xgi9RvgKWFtwhe6nU0 -tIH806RBdtrINmFo4ETT+AJG+Qlsjt7pT7ma1VGhcFg ---- qtBi22jcciVOREt4KXxtDa0jAAWh72IJYxWfm5zJkLw -*'E@2m@up@ oxu[3oC)kd \ No newline at end of file +-> ssh-ed25519 Fz/sQw rQN5IePuikUj21+MTQt/xpEe3m+Zw/8Rm053HL9xCHc +fZ2CxR+VF5XVMbt85J528bV/5XoA7sO+UpsnhYPeMqU +-> ssh-ed25519 47GzQA xzWNpBSxYTuMaroz4Q50OJGEUKSWQnBwGU7Ifkjklwo +r45yaxjXnaqBlIhNp3Q6q1UfVfXa/o+wTJlZDm8Sb8w +-> ssh-ed25519 wcI7nQ ID/cXFOMN8kYY+a6cWNbhpvA3Ha9pbNx8ZPHKzhR0Rw +P5aTL4aSLu4hYetkomVc+/rNmtCFTBllLCOG9v84wC8 +-> ssh-ed25519 QjdSCg wDZDWYpofkX7uLfhujOViQbgdsfYKHYgT7NwizF7nWE +owLD1QEvSQELju8NH4/IbfagOmjb9WFuvu6V6i8FkNw +-> ssh-ed25519 AVW/jQ XuNe9Vn6VhtIsPf3ECIXCuYz2XivPDcCI0OZoj8wx1Y +2aqV/Aro4atkB2EC6LkbFbqXGmwVttD3N004fKxgsmk +--- RxTtgkAtbtDZSEiPpmE4YWKOVlPZrdxgsCJQxtWvEmc +7򿳙EZǶtOJ!>B_[yb7j" \ No newline at end of file diff --git a/provision/secrets/git/gitea-runner-1.age b/provision/secrets/git/gitea-runner-1.age index fd294333..a4ce296e 100644 --- a/provision/secrets/git/gitea-runner-1.age +++ b/provision/secrets/git/gitea-runner-1.age @@ -1,11 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 Fz/sQw g+IGtINUcLc4rWyoCqeS2bDcwsrkX5T8R21OQpN6Pg0 -ZYyHnwoxbd1yW2gg8emU12R936VU8YZgDZzyLG768mg --> ssh-ed25519 47GzQA rWJ/5U7wOT1eVSkB58vdVxBYZSWCGadzWkAnHX4/RlI -87XIYlhgHRF41fM9FDLJhYhGmINyTpgnDRj4kdTlQ6A --> ssh-ed25519 wcI7nQ cY8uw7A4bYtpgBCxw9A0QcJGjfNzyJc85oHB8ke90F0 -b6rcrUHrz6dCLFoMA1Au69G4W2J7f6VxWBo1OOWuGQY --> ssh-ed25519 QjdSCg 7WNZYo6frEXqJdEE76/vUN3LO51vJymYq5ivD05cuk4 -OFchcRjb4D8Re1pqZfBUgAXnhyJggUnuh4aPtDU7eKE ---- ATkyepQOfhYIxwZlC0DHe6jUOfmBtOiAXj/ndLXABhs -g+f[^c*ɸ5ZYDz-|ÖQi/ȍ-Zz01@& \ No newline at end of file +-> ssh-ed25519 Fz/sQw 0Tbtsud6XO2DVzAiM8U+541mMjiaYJslaq5JTtHTdTs +bdnmsktziAoSrZpDykic+5bHzmAM78AcJrMC1gkrAvg +-> ssh-ed25519 47GzQA 8VjVRPqUT0c/14Ka5xuc85fkIV3avrJm+fdTAX91DGw ++703fKNuShBPXverFWsJibgEfH2/3reZ8M/l2NsFR/U +-> ssh-ed25519 wcI7nQ nhwIDzgmAPCyO5k9Km0L+dTCZikRTfh8Gp8/tEFRchs +DurhCojPnr2AHyg07+Or5JUb/l6QdLKd7wMuuwzON4Q +-> ssh-ed25519 QjdSCg FtAVPYOZxmqmokz4gD6ux3ihl26Uw4R15HZlBV2o8DE +SGSoJ0Mv+te4x1b3QGF6V1IR1JD1KZcqbnq6Ha9pUio +-> ssh-ed25519 AVW/jQ 6OFVTVVVl92KX+vgKEw7kbt3DPU7gcAxLWck3asxwk4 +bK3S5/KH4SRIWBWtN03mBJf4UqWjWJKAH4GjuwjmLbI +--- 6ILfpKSN3gvPE7zx4bJFhocvGRMWGjoIt7uGwTXPvDk +xE챝ad*&N0H Q.s̤m/%&9upwH*`W \ No newline at end of file diff --git a/provision/secrets/git/github_personal.age b/provision/secrets/git/github_personal.age index 6ec47f48..26c9b82b 100644 Binary files a/provision/secrets/git/github_personal.age and b/provision/secrets/git/github_personal.age differ diff --git a/provision/secrets/secrets.nix b/provision/secrets/secrets.nix index e474e2c7..1712b227 100644 --- a/provision/secrets/secrets.nix +++ b/provision/secrets/secrets.nix @@ -3,7 +3,8 @@ let torus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN71z5g6QyCn5Go0Wm+NOSF4f22xOOCvtIA3IM4KzSpG"; bulwark = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG52QybtJrt0KU7iJGyiBBoDCcd0AXoy+wFi+9fBsopk"; osprey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINpYnahS9+WKJrM3ZpjZlMLL5V7iwJJqZml337VuG7Jq"; - systems = [ kestrel torus bulwark osprey ]; + stormwalker = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHvAGrh01zvH8dbj8NdrNxkRcQ/pRt27WjK6uHNNoG4n"; + systems = [ kestrel torus bulwark osprey stormwalker ]; in { "git/github_personal.age".publicKeys = systems; diff --git a/provision/secrets/ssh/kestrel/id_ed25519.age b/provision/secrets/ssh/kestrel/id_ed25519.age index 784a0a82..fce637a0 100644 Binary files a/provision/secrets/ssh/kestrel/id_ed25519.age and b/provision/secrets/ssh/kestrel/id_ed25519.age differ diff --git a/provision/secrets/ssh/kestrel/id_ed25519.pub.age b/provision/secrets/ssh/kestrel/id_ed25519.pub.age index 8b193650..9c1997f6 100644 --- a/provision/secrets/ssh/kestrel/id_ed25519.pub.age +++ b/provision/secrets/ssh/kestrel/id_ed25519.pub.age @@ -1,12 +1,14 @@ age-encryption.org/v1 --> ssh-ed25519 Fz/sQw kJnssrkwG447kD8G79Q259iBRUS1dNMjjq4geT/IeEU -4RmZIqILTYaISCIglbKd5NAOox2b0RZUSf0jLJlUfFs --> ssh-ed25519 47GzQA yY4DJEVGAy9KK2OW3xJRBYz2lMTCiEPSnwIcLhWqzik -0CfdGxKvn8wzuxES5+wDOGWD2xDNljx/isXsHj41XG4 --> ssh-ed25519 wcI7nQ wg2CPj/E/IB8EnqY6vvtzf1OHmGa8/uYF6jsjHYU2Ag -+QigxEkkEL8QZGMpoHMRKC5F1hpbi5tZRIWotXpSKJs --> ssh-ed25519 QjdSCg n6xqFk/hnWK07u3BECBlyN1iYT4JHXOLLIw7JtylMnU -pyZ3hUaiGbslYzQivrrMiHlpvSLksCyjVfNqaEFrBY0 ---- AMutBl45G25VJgstVtk3zIxkcqNJba6ZfMlDsaUvMW8 -2 ,?hgoh -_Slyujͫ=V~d6*-Kt ͫ#DaL~$k5S=- \ No newline at end of file +-> ssh-ed25519 Fz/sQw lh5pfTkixS/Jw6HSdv3X+M87OwxN+hE/VDtTks4QxzY +1mCflgQZPJIaidY6OKqu4Cr8n1voR666/ezEmpZbGF0 +-> ssh-ed25519 47GzQA 6PKrcfc11TTUHdcuc/SWmXRAjcagqgRDeJSeEkbmvG0 +moUq2WQ4CX0c06AOSP6BruuJZH+CYlL9obzA4EWJmdg +-> ssh-ed25519 wcI7nQ GBVaWjuHF80DUmHd2nI4I1cbJDGh8ytv0cihExePsy0 +gzVehAtjUsiLfMp+X6mX6aA0dubxoH39eIa2vFLNtYs +-> ssh-ed25519 QjdSCg ddCkJ3cTSqoGc1IAWR3lNcrU4ZNDx99o9mw05r68x1k +wN8z48pGMJcQSzL+VNQN/SZBoOV8VPoEV6cgH48kbqk +-> ssh-ed25519 AVW/jQ 4ClJ85fix6wdaq65GRcENth5/Ta5ME+Gas8laQs2UFU +e9YqaPeCeP0ciUGbhGmq71EUMkFuf5Zlbx0HyzrKaVo +--- BWeSCKCmADkdhENNZbfTporKluvZxjp/vY/74wWrKyo +!ɀJy)j +|8f]sVJMЪ'6YPyw"QŤ:y$BnqSlFDwvs8h2FTٮqA.}(Z4,MDZPe #V \ No newline at end of file diff --git a/provision/secrets/ssh/torus/id_ed25519.age b/provision/secrets/ssh/torus/id_ed25519.age index 0f087ef9..8ed77c4a 100644 Binary files a/provision/secrets/ssh/torus/id_ed25519.age and b/provision/secrets/ssh/torus/id_ed25519.age differ diff --git a/provision/secrets/ssh/torus/id_ed25519.pub.age b/provision/secrets/ssh/torus/id_ed25519.pub.age index 9994b62c..c6a2f2c7 100644 Binary files a/provision/secrets/ssh/torus/id_ed25519.pub.age and b/provision/secrets/ssh/torus/id_ed25519.pub.age differ diff --git a/provision/secrets/syncthing/bulwark/cert.pem.age b/provision/secrets/syncthing/bulwark/cert.pem.age index d3e2b663..030a17a0 100644 Binary files a/provision/secrets/syncthing/bulwark/cert.pem.age and b/provision/secrets/syncthing/bulwark/cert.pem.age differ diff --git a/provision/secrets/syncthing/bulwark/key.pem.age b/provision/secrets/syncthing/bulwark/key.pem.age index 6548e996..fd9a9101 100644 Binary files a/provision/secrets/syncthing/bulwark/key.pem.age and b/provision/secrets/syncthing/bulwark/key.pem.age differ diff --git a/provision/secrets/syncthing/kestrel/cert.pem.age b/provision/secrets/syncthing/kestrel/cert.pem.age index 06cb2f04..d4ebfa61 100644 Binary files a/provision/secrets/syncthing/kestrel/cert.pem.age and b/provision/secrets/syncthing/kestrel/cert.pem.age differ diff --git a/provision/secrets/syncthing/kestrel/key.pem.age b/provision/secrets/syncthing/kestrel/key.pem.age index af9fae15..b57149d1 100644 Binary files a/provision/secrets/syncthing/kestrel/key.pem.age and b/provision/secrets/syncthing/kestrel/key.pem.age differ diff --git a/provision/secrets/syncthing/torus/cert.pem.age b/provision/secrets/syncthing/torus/cert.pem.age index 21e1d4d4..bbd21ceb 100644 Binary files a/provision/secrets/syncthing/torus/cert.pem.age and b/provision/secrets/syncthing/torus/cert.pem.age differ diff --git a/provision/secrets/syncthing/torus/key.pem.age b/provision/secrets/syncthing/torus/key.pem.age index b4ae3fd2..2615a6fe 100644 --- a/provision/secrets/syncthing/torus/key.pem.age +++ b/provision/secrets/syncthing/torus/key.pem.age @@ -1,13 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 Fz/sQw 7DDgnv+81tF0Yo+0hS5R18hY3xS9BCryToqXC6y8NiU -GbEXd0PitRZrLDFGViqLd4utW7G2t65aQStRQFr9cvQ --> ssh-ed25519 47GzQA FNDdayBjuWAlekh0mv2/LBqrWVGepQt/Y9S9d7QHEww -EuBS9nJzuWMOBUnlmxgtmyjCcdy9wbpOi3v38rZSjaE --> ssh-ed25519 wcI7nQ gapVtIbKBd35FBdQBxs9oguS0J5q6yij4eT0LxYaqBI -fokGG3YpY+MjqryztD42eAb3SXiMhzpCulPhoFSyjs0 --> ssh-ed25519 QjdSCg 1Ub+LQgr+1EtqcpuKyBE0P0Cl44xiJo1e4ENhJFNmgk -1xzBGv6QmvFxEydmttOTOKPvof17A8nCSdtS/pfjPGU ---- mRpygsZQOGP/pwaaKPgU+9SmmWskY0Oa2aCir8xImwc -- lǞ,RvOrƔX4fn| i[~w&[~PІ&t4v NPd|w#08rn6AFS:u˄tmT --fP!Lg'VhCr羳 )"jʏxj `*Yj] ZEŴ?y -TO}(Z1g,YܙY+9+Ịϧm6vN,5E,HJ#[z xII~JOON_Ic0s\QGj-^3"V+ZxlYq{lLM \ No newline at end of file +-> ssh-ed25519 Fz/sQw n2eF75pqom4mrFydvPaByoXWIl8etPEdu2OqixYIpxo +i+yVt3keb4Ll2zd8CNdz3kqBKrI+l1Dz7VcCw8z9TP0 +-> ssh-ed25519 47GzQA gNSu/vy/66oKE6CTFMGyTrWc2NGSNaT9TbwUhjwSXhc +ZJLgK80QjfSINLicZRAIbJ7J7KBtdKmSslcghitRGNE +-> ssh-ed25519 wcI7nQ EltLznFJWJPxzgsH2v5zkSKzbCCTbV1/EpWE2y1udBs +B8H0fX+5cFN3F1HHOt6beRNmik8JzzIIT85tWiWmUfQ +-> ssh-ed25519 QjdSCg IP5oeJ3Goiinfv98QfFXpoqaBZlL3JXOT6lCxOS8dEk +r1EZVdY0ge4AZ2f3PjGvz0VtkupHuE9qZh0piTeRvQM +-> ssh-ed25519 AVW/jQ jqz3lfMMuKTEGt1s3pVi6lRupmSXVkat2dcwDS9YS0w +25re+Dt11KGDnEpcEj+Uyni3XXgq+o3CENGeFiVuBL8 +--- vFXRlnEAGGA+yCJRahJm+TON6dEThf69/VpV2c9xggo +r%Üy0WoekM]&fQKAAr>ɸsʒb$풐RW&zN1,[iaB*|Y2q?<}cǷb{o7KDJ utԯSKP4|yb?H$Bs|*pYfb&'5 Y}ƈJ=p.s+%)H:Ή},=_ y>Ϳ.DY8dv;^o+HZ_BWj*H/֛xԋ?:Xe>]kg[, \ No newline at end of file diff --git a/provision/secrets/wireguard/bulwark.age b/provision/secrets/wireguard/bulwark.age index 354c5739..e6f14aa2 100644 Binary files a/provision/secrets/wireguard/bulwark.age and b/provision/secrets/wireguard/bulwark.age differ diff --git a/provision/secrets/wireguard/kestrel.age b/provision/secrets/wireguard/kestrel.age index 07bcff8d..181ff083 100644 Binary files a/provision/secrets/wireguard/kestrel.age and b/provision/secrets/wireguard/kestrel.age differ diff --git a/provision/secrets/wireguard/osprey.age b/provision/secrets/wireguard/osprey.age index 2f2f1f20..9eef284b 100644 Binary files a/provision/secrets/wireguard/osprey.age and b/provision/secrets/wireguard/osprey.age differ diff --git a/provision/secrets/wireguard/torus.age b/provision/secrets/wireguard/torus.age index 38506bd8..144c3c2b 100644 Binary files a/provision/secrets/wireguard/torus.age and b/provision/secrets/wireguard/torus.age differ