From db326543f0fbc72d7760d9b5fae36c2ca3bbfd2e Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Tue, 02 Jul 2024 18:30:11 +0000 Subject: [PATCH] feat: add node id to garbage secret generator --- --- a/lib/fleetLib.nix +++ b/lib/fleetLib.nix @@ -60,19 +60,25 @@ script = '' mkdir $out gh generate ed25519 -p $out/public -s $out/secret \ - ${lib.optionalString noEmbedPublic "--no-embed-public"} \ - ${lib.optionalString (encoding != null) "--encoding=${encoding}"} + ${optionalString noEmbedPublic "--no-embed-public"} \ + ${optionalString (encoding != null) "--encoding=${encoding}"} ''; }; - mkGarage = {}: mkEd25519 {noEmbedPublic = true;}; + mkGarage = {}: {mkSecretGenerator, ...}: mkSecretGenerator { + script = '' + mkdir $out + gh generate ed25519 -p $out/public -s $out/secret + gh decode -i $out/public | gh public -e hex -o $out/node_id + ''; + }; mkX25519 = {encoding ? null}: {mkSecretGenerator, ...}: mkSecretGenerator { script = '' mkdir $out gh generate x25519 -p $out/public -s $out/secret \ - ${lib.optionalString (encoding != null) "--encoding=${encoding}"} + ${optionalString (encoding != null) "--encoding=${encoding}"} ''; }; -- gitstuff