From 5cc5e2d1e6d33279a90caf15cb8d72ea437393c9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 5 Oct 2023 21:25:19 +0200 Subject: kartei lass: remove legacy keys --- kartei/lass/default.nix | 29 ++--------------------------- krebs/2configs/default.nix | 2 -- krebs/2configs/tor/initrd.nix | 2 -- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/kartei/lass/default.nix b/kartei/lass/default.nix index fac48a8b..fe372580 100644 --- a/kartei/lass/default.nix +++ b/kartei/lass/default.nix @@ -25,36 +25,11 @@ in { inherit (slib) krebs; }) ); - users = rec { - lass = lass-yubikey; - lass-yubikey = { + users = { + lass = { mail = "lass@green.r"; pubkey = builtins.readFile ./ssh/yubikey.rsa; pgp.pubkeys.default = builtins.readFile ./pgp/yubikey.pgp; }; - lass-blue = { - mail = "lass@blue.r"; - pubkey = builtins.readFile ./ssh/blue.rsa; - }; - lass-green = { - mail = "lass@green.r"; - pubkey = builtins.readFile ./ssh/green.ed25519; - }; - lass-red = { - mail = "lass@red.r"; - pubkey = builtins.readFile ./ssh/red.ed25519; - }; - lass-mors = { - mail = "lass@mors.r"; - pubkey = builtins.readFile ./ssh/mors.rsa; - pgp.pubkeys.default = builtins.readFile ./pgp/mors.pgp; - }; - lass-android = { - mail = "lassulus@gmail.com"; - pubkey = builtins.readFile ./ssh/android.ed25519; - }; - lass-tablet = { - pubkey = builtins.readFile ./ssh/tablet.ed25519; - }; }; } diff --git a/krebs/2configs/default.nix b/krebs/2configs/default.nix index bd4f36cb..905eaaef 100644 --- a/krebs/2configs/default.nix +++ b/krebs/2configs/default.nix @@ -48,9 +48,7 @@ with import ../../lib/pure.nix { inherit lib; }; users.mutableUsers = false; users.extraUsers.root.openssh.authorizedKeys.keys = [ - config.krebs.users.jeschli-brauerei.pubkey config.krebs.users.lass.pubkey - config.krebs.users.lass-mors.pubkey config.krebs.users.makefu.pubkey config.krebs.users.tv.pubkey config.krebs.users.kmein.pubkey diff --git a/krebs/2configs/tor/initrd.nix b/krebs/2configs/tor/initrd.nix index 21c46a0a..76843973 100644 --- a/krebs/2configs/tor/initrd.nix +++ b/krebs/2configs/tor/initrd.nix @@ -7,9 +7,7 @@ enable = true; port = 22; authorizedKeys = [ - config.krebs.users.jeschli-brauerei.pubkey config.krebs.users.lass.pubkey - config.krebs.users.lass-mors.pubkey config.krebs.users.makefu.pubkey config.krebs.users.tv.pubkey ]; -- cgit v1.2.3