From f782c15aaeeef1cf0cc0224284fe2380b669faef Mon Sep 17 00:00:00 2001 From: niten Date: Tue, 19 Oct 2021 13:16:13 -0700 Subject: [PATCH] Fixes for procul. --- config/hosts/procul.nix | 21 +++++++++++++-------- lib/fudo/hosts.nix | 1 + 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/config/hosts/procul.nix b/config/hosts/procul.nix index 2905813..a904c9e 100644 --- a/config/hosts/procul.nix +++ b/config/hosts/procul.nix @@ -1,21 +1,26 @@ { description = "informis.land server."; docker-server = true; - # ssh-fingerprints = [ - # "1 1 d089902f60751b3d35b5329bf7b906df254d5fa7" - # "1 2 8deebf42bbc40881a327f561bffd5d7bd328a4fc94d4e4ce8c502a9c6cbdfb92" - # "4 1 2a8e086d3589ce50b58c55bc35638af8da23988e" - # "4 2 55a9f7c0addf08bb24c62ced954574db6e95eff38ee56d6a2cff312d20eb910e" - # ]; rp = "niten"; admin-email = "niten@fudo.org"; domain = "informis.land"; site = "joes-datacenter-0"; profile = "server"; - # ssh-pubkey = - # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKEsvl1mTSWJJrqXbYrc8wYdlOiW5gNg4Nzf2QCxB6XW"; tmp-on-tmpfs = false; enable-gui = false; arch = "x86_64-linux"; nixos-system = true; + machine-id = "41119f30fdf742dd82d20d94b7a2aa25"; + master-key = { + public-key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIqUnzf8bfPyoJX6XjFqD6v5MZQnV8STP0152VS3uwM7"; + key-path = "/state/master-key/ed25519_key"; + }; + initrd-network = { + ip = "172.86.179.18"; + interface = "enp0s25"; + keypair = { + public-key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIgvl/pxPGN5XuUFsEywHV/PJMI+wPHA6NKTtE8SZC04"; + private-key-file = "/state/ssh/initrd/ssh_ed25519_key"; + }; + }; } diff --git a/lib/fudo/hosts.nix b/lib/fudo/hosts.nix index a21b4ae..f642594 100644 --- a/lib/fudo/hosts.nix +++ b/lib/fudo/hosts.nix @@ -104,6 +104,7 @@ in { backplane-passwd-source = try-attr hostname files.backplane-passwords; backplane-passwd-target = "/var/run/backplane/passwd"; + in { secrets.host-secrets.${hostname} = { host-keytab = mkIf (keytab-file != null) {