summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-09-27 16:55:17 +0200
committertv <tv@shackspace.de>2015-09-27 16:55:17 +0200
commit4946561e0ae254df8068905286204a4da517621d (patch)
treeeeb7552a97fd48e4e2a8692eb98621dca0cf8771
parent0e069d964e89248ee3f0df72c7e6998ae1c204ff (diff)
krebs.build.scripts.init: don't try to use privkey
^_^
-rw-r--r--krebs/3modules/build/default.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/krebs/3modules/build/default.nix b/krebs/3modules/build/default.nix
index 993ccb702..23bd8c8fd 100644
--- a/krebs/3modules/build/default.nix
+++ b/krebs/3modules/build/default.nix
@@ -33,7 +33,6 @@ let
default =
let
inherit (config.krebs.build) host;
- inherit (host.ssh) privkey;
in
''
#! /bin/sh
@@ -41,7 +40,7 @@ let
hostname=${host.name}
secrets_dir=${config.krebs.build.source.dir.secrets.path}
- key_type=${privkey.type}
+ key_type=ed25519
key_file=$secrets_dir/ssh.id_$key_type
key_comment=$hostname
@@ -49,8 +48,6 @@ let
echo "Warning: privkey already exists: $key_file" >&2
else
ssh-keygen \
- ${optionalString (privkey.bits != null)
- "-b ${toString privkey.bits}"} \
-C "$key_comment" \
-t "$key_type" \
-f "$key_file" \
@@ -62,7 +59,6 @@ let
cat<<EOF
# put following into config.krebs.hosts.$hostname:
- ssh.privkey = <secrets/ssh.id_$key_type>;
ssh.pubkey = $(echo $pubkey | jq -R .);
EOF
'';