From 1173a83b7717f2cd35133c813fee94169d6fd7f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 4 Jan 2023 22:36:18 +0100 Subject: [PATCH] Delete old known_hosts option --- modules/c3d2.nix | 27 --------------------------- ssh-public-keys.nix | 28 ---------------------------- 2 files changed, 55 deletions(-) diff --git a/modules/c3d2.nix b/modules/c3d2.nix index 60d601fa..3f0d4dc6 100644 --- a/modules/c3d2.nix +++ b/modules/c3d2.nix @@ -199,32 +199,5 @@ in '') config.networking.nameservers; }; - - # TODO: convert into usable module - programs = { - ssh.knownHosts = - let - inherit (import ../ssh-public-keys.nix) hosts; - list = map - (name: { - inherit name; - value = - let - ip6 = - if zentralwerk.lib.config.site.net-combined.hosts6 ? name then - zentralwerk.lib.config.site.net.hosts6.${name} - else - toHqPrivateAddress name; - in - { - publicKey = lib.head (lib.getAttr name hosts); - hostNames = [ ip6 "${name}.hq.c3d2.de" name ]; - }; - }) - (builtins.attrNames hosts); - keyedHosts = lib.filter (x: x.value.publicKey != null || x.value.publicKeyFile != null) list; - in - lib.listToAttrs keyedHosts; - }; }; } diff --git a/ssh-public-keys.nix b/ssh-public-keys.nix index 3b471430..57be4e27 100644 --- a/ssh-public-keys.nix +++ b/ssh-public-keys.nix @@ -61,32 +61,4 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANupx+diz5N8sGZOc7ZXopyPh9HaML8M7Qh70aVVIaJ leon@leons-Air" ]; }; - - # TODO: how to deduplicate with nix-user-module? - hosts = { - freifunk = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMFbxHGfBMBjjior1FNRub56O62K++HVnqUH67BeKD7d" - ]; - gitea = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO8Q7kGF3Hh6HvmlSIgZOjgoIZRpyxKvMBTcPWHlecuh" - ]; - glotzbert = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAnEWn/8CKIiCtehh6Ha3XUQqjODj0ygyo3aGAsFWgfG" - ]; - grafana = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPFB9fo01jzr2upEBEXiR7sSmeQoq9ll5Cf5/hjq5e4Y" - ]; - matemat = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBa07c4NnU1TGX1SMNea9e1d4nMtc0OS4gJLmTA3g/fe" - ]; - nncp = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMQhxaeElmxO1UgaI/+qr+g13OFeY9qtJVxznNN+xs/e" - ]; - pulsebert = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFQCsDss9Gq3/eTKqpgEwXK+nhnuARS4/kHqF2+laGnp" - ]; - scrape = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEGxPgg6nswoij1fBzDPDu6h4+d458XL2+dBxAx9KVOh" - ]; - }; }