From 77851369998fd8c0058bd48b66f3492d54d22cfd Mon Sep 17 00:00:00 2001 From: jolheiser Date: Thu, 8 Aug 2024 17:24:50 -0500 Subject: [PATCH] feat: move remaining rsa keys to ed25519 Signed-off-by: jolheiser --- machines/dragonwell/default.nix | 2 +- machines/dragonwell/git-pr.nix | 4 +--- machines/dragonwell/ugit.nix | 2 +- secrets/shared/ssh-config.age | Bin 2073 -> 2052 bytes 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index f380867..b661995 100644 --- a/machines/dragonwell/default.nix +++ b/machines/dragonwell/default.nix @@ -1,6 +1,6 @@ let username = "jolheiser"; - key = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfKqCWtDlS3tgvfT6hQN+ii8UtabIZ+ZNmYN+bLwIa8PHOEW5MbfaqXSlhKkSi4+7SfQDCHphw0SMfhsQ4qMEcoywZ+4niDgKlQEVkl+S/VGbLuPe92NRStkyreZBLPr3Rh7ScNlGHcmHmoV9v7725fMnsMmabGVhpGO84PwNHOfJyv2tx2h6LxFbAV8S44UQu2lc8YLWCK2UvKuRnBerBXLnDQThUUX8UuCFzb786gQzD5XDU0MENbByxiy0XdVGAC+tFXEiSIgFZlFbFYyShgdTP9MzX2MOglEi+ae+1UIFncraW7ptUey7qHFJylpHWWWvE+GTwsg2G50i0FvFj jolheiser@jolheiser''; + key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+uhnfFLhlyfGGsksSxh5IIY6gnIMryeQ2EiM979kZa"; in { imports = [ diff --git a/machines/dragonwell/git-pr.nix b/machines/dragonwell/git-pr.nix index c5e2bc7..bcb7b50 100644 --- a/machines/dragonwell/git-pr.nix +++ b/machines/dragonwell/git-pr.nix @@ -3,9 +3,7 @@ enable = true; openFirewall = true; url = "pr.jolheiser.com"; - admins = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx" - ]; + admins = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXoiWcPkL5kUAqJfMxnPM/ND4qJ4kKShDhXdqnYv2ZB" ]; sshPort = 7448; enableWeb = true; webPort = 7449; diff --git a/machines/dragonwell/ugit.nix b/machines/dragonwell/ugit.nix index ab53191..c7ef77e 100644 --- a/machines/dragonwell/ugit.nix +++ b/machines/dragonwell/ugit.nix @@ -3,7 +3,7 @@ enable = true; openFirewall = true; authorizedKeys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXoiWcPkL5kUAqJfMxnPM/ND4qJ4kKShDhXdqnYv2ZB" ]; tsAuthKey = "tskey-auth-kRUJE7zxH621CNTRL-Td29STXSrtTUHdacaKaYtTD82uyDXZj7"; # One-time key config = { diff --git a/secrets/shared/ssh-config.age b/secrets/shared/ssh-config.age index 19e1c68c9616466985fe72951fac39e910418e78..1f1e089e70daac9ea40938279e88db0876760946 100644 GIT binary patch delta 1973 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