From 659d5a5241ed7245e867b05263dafcf790756659 Mon Sep 17 00:00:00 2001 From: oddlama Date: Sat, 6 Jan 2024 01:44:12 +0100 Subject: [PATCH] chore: add sire hostkey; also wait for cryptsetup before importing storage --- hosts/sire/fs.nix | 2 ++ hosts/sire/secrets/host.pub | 2 +- users/myuser/secrets/user.nix.age | Bin 3027 -> 3115 bytes 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hosts/sire/fs.nix b/hosts/sire/fs.nix index 11d9449..bce561b 100644 --- a/hosts/sire/fs.nix +++ b/hosts/sire/fs.nix @@ -49,6 +49,8 @@ in { }; }; + boot.initrd.systemd.services."zfs-import-storage".after = ["cryptsetup.target"]; + services.zrepl = { enable = true; settings = { diff --git a/hosts/sire/secrets/host.pub b/hosts/sire/secrets/host.pub index 93bddad..b99c515 100644 --- a/hosts/sire/secrets/host.pub +++ b/hosts/sire/secrets/host.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFMbumSAJX2MOuQO+5tFoL52Fe+TRD2dZwzNCGilACQ/ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICoFkQ3/VdPXBh4cB3nRF5EtVWNV4AdEaGG0yXSBjPOD diff --git a/users/myuser/secrets/user.nix.age b/users/myuser/secrets/user.nix.age index 3f84acd285bff1a370e6f67c196e27b08a217c81..3fc0b5f6d1033cb8b0a963e9f3a1fa1b3a6ca013 100644 GIT binary patch delta 3114 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 T;xWxjr^R0aw4mT)f#@Q?2`rw=