From 9580a0247777a5652683d6573f3e6fe63459f011 Mon Sep 17 00:00:00 2001 From: buffet Date: Tue, 30 Jul 2024 20:24:34 +0200 Subject: [PATCH 1/3] feat: new borg key --- hosts/alice/borg.nix | 2 +- hosts/ami/borg.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/alice/borg.nix b/hosts/alice/borg.nix index 625d4f9..c0ddb9a 100644 --- a/hosts/alice/borg.nix +++ b/hosts/alice/borg.nix @@ -20,7 +20,7 @@ in { }; startAt = "daily"; persistentTimer = true; - environment.BORG_RSH = "ssh -i /home/buffet/.ssh/id_borg"; + environment.BORG_RSH = "ssh -i /home/buffet/.ssh/id_borg_ed25519"; extraArgs = "--remote-path borg1"; prune.keep = { within = "1d"; diff --git a/hosts/ami/borg.nix b/hosts/ami/borg.nix index 43a48c3..11da7f5 100644 --- a/hosts/ami/borg.nix +++ b/hosts/ami/borg.nix @@ -18,7 +18,7 @@ in { }; startAt = "daily"; persistentTimer = true; - environment.BORG_RSH = "ssh -i /root/.ssh/id_borg"; + environment.BORG_RSH = "ssh -i /root/.ssh/id_borg_ed25519"; extraArgs = "--remote-path borg1"; prune.keep = { within = "1d"; -- 2.46.0 From 7a6fed7824254a509024729734656de5c37c9a82 Mon Sep 17 00:00:00 2001 From: buffet Date: Tue, 30 Jul 2024 20:54:00 +0200 Subject: [PATCH 2/3] feat: switch ssh keys for login --- keys.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keys.nix b/keys.nix index ebeaae7..5521c8f 100644 --- a/keys.nix +++ b/keys.nix @@ -1,3 +1,4 @@ [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDci73LlPFhg9Z26jnuGMzGEh0jO192alsLhSVUE+CIOkRfkeRonJ69WxwY9kBFAa5PyY9zrAr2XueLWaQAaHJdmHyWbXmMJGtqsx0oB5KU4aFL8stJGkr8u6Bv5HPpkGr4PyqGkzKEPirUBYOMxXW3KSuP5LCTTx+UVoEFhIRS+j6w67ZIjyEHalwZAVJP8sp1GJkk9eQkmoJjdBt4qxAoBRaZp8kTzdKJezJY1g0f+JBI+0ZUDPS2IdAAXroVho/ea31gGFRsqazbP17Tpbiy1H4dQwTc19YkyOYu7R4klRrOVjzh/CBYgTUmIV1czUISG6KEGfgW4IciYSc6R5IGo+GCf3OsNVDKjjgxCvCLLx03KsBZJXoQJlZ/grfoQ0aulUR/hDeAyOU/bE2XjpzkNiYKhlMd7gEN3AC1iCjsYNL+6Nr82GVpn5XE0UsDYFJyZ//6zI4ldNnCcuYPNgyE9VabaUh0WuemkhdTe/SKIBOQfHSLFlEAZVWVGUQV/dvi5HY9Ie4nIHtUU1IdeNiCa+OB+KxIE5a9+2h5KJB2NPCyPt1TImqS/OiXaQlihEPsNOyKqbBiN/4LUPtixAGbnbdzBwmdP8Pt32Y1ehOyBoDxLv36R1hHP9Xn4C+KUX35lhpfToSRVvWvVUcDDZVq3kUnxPV22BTs3kgLG3rJ6Q==" # id_rsa + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOAGM5/HyFiaaYN3N1a22/13TbETG8HPyiD5g/9kxg6F" # id_master_ed25519 + "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBJdHUlzs4wdIGlywHNXKtfOdemW64uPPZP7d8DirIhXs2ps5mF0tc2Osg7iJB0AIUoiSbCZcivqAHdBf0DRvO+8AAAAEc3NoOg==" # id_ami_ecdsa-sk ] -- 2.46.0 From 5a7cfef296b0628a801d034e3f028e5ba2582d45 Mon Sep 17 00:00:00 2001 From: buffet Date: Tue, 30 Jul 2024 21:16:44 +0200 Subject: [PATCH 3/3] feat: rename buffet identity key --- users/buffet/ssh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/buffet/ssh.nix b/users/buffet/ssh.nix index afa1c6a..29d666d 100644 --- a/users/buffet/ssh.nix +++ b/users/buffet/ssh.nix @@ -7,7 +7,7 @@ Host kitchen Hostname buffets.kitchen User forgejo - IdentityFile ~/.ssh/id_buffet_ecdsa + IdentityFile ~/.ssh/id_buffet_ecdsa-sk ''; }; -- 2.46.0