summaryrefslogtreecommitdiffstats
path: root/krebs/default.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-11-05 11:10:14 +0100
committermakefu <github@syntax-fehler.de>2015-11-05 11:10:14 +0100
commit625cfe81a09e3d9d19311188d80387292962ac72 (patch)
tree25d1d0807715bbaec23862a21554f32e0417ce71 /krebs/default.nix
parent8995bdd5fc7ea8ef54b4e30ceb50825ba23054ba (diff)
parent1ddbdddc696316986b07376a7fc5e33aaf228e89 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/default.nix')
-rw-r--r--krebs/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/krebs/default.nix b/krebs/default.nix
index 31a7f7d04..bfd6175d9 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -84,6 +84,7 @@ let out = {
cat<<EOF
# put following into config.krebs.hosts.$system:
+ ssh.privkey.path = <secrets/ssh.$key_type>;
ssh.pubkey = $(echo $pubkey | jq -R .);
EOF
'';
@@ -178,7 +179,7 @@ let out = {
nix-path =
lib.concatStringsSep ":"
- (lib.mapAttrsToList (name: _: "${name}=/root/${name}")
+ (lib.mapAttrsToList (name: src: "${name}=${src.target-path}")
(config.krebs.build.source.dir //
config.krebs.build.source.git));
in ''