summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-07-23 19:19:18 +0200
committerlassulus <lass@aidsballs.de>2016-07-23 19:19:18 +0200
commit29ef105c46287bb9964269004a56c51d4a2834bd (patch)
tree5b0f41ffade785bab8eca92bdecf029528aee1a4
parent18469388a6f8f255b8094d002b3c176dab81b845 (diff)
l 2 buildbot: uss ssh sockets
-rw-r--r--lass/2configs/buildbot-standalone.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index 5afb23687..7c7693ab7 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -3,8 +3,13 @@
with config.krebs.lib;
let
+ sshHostConfig = pkgs.writeText "ssh-config" ''
+ ControlMaster auto
+ ControlPath /tmp/%u_sshmux_%r@%h:%p
+ ControlPersist 4h
+ '';
sshWrapper = pkgs.writeDash "ssh-wrapper" ''
- ${pkgs.openssh}/bin/ssh -i ${shell.escape config.lass.build-ssh-privkey.path} "$@"
+ ${pkgs.openssh}/bin/ssh -F ${sshHostConfig} -i ${shell.escape config.lass.build-ssh-privkey.path} "$@"
'';
in {