summaryrefslogtreecommitdiffstats
path: root/krebs/default.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-11-06 22:23:46 +0100
committermakefu <github@syntax-fehler.de>2015-11-06 22:23:46 +0100
commit736e1426d5a7ec76d0987840552d56c6b4f0248e (patch)
tree944c5595dfbb2c66dfe934d48cc8349522c91aa8 /krebs/default.nix
parent2dcb2918d1cd159d9282096ef3b5cecc4239bfbc (diff)
parent12597b1febb0bc47cf98529a12e5fc6af1d8f5a4 (diff)
Merge branch 'master' of pnp:stockholm
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 ''
[cgit] Unable to lock slot /tmp/cgit/2c100000.lock: No such file or directory (2)