diff options
| author | makefu <github@syntax-fehler.de> | 2016-07-27 10:58:39 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-07-27 10:58:39 +0200 |
| commit | 041eeaa4c9924d571d6977112ed7f0ebf7d0791c (patch) | |
| tree | bb58908e6113917096a476cadf98ee5065b0ca83 /lass/2configs/buildbot-standalone.nix | |
| parent | 88a220f78825c1bfc60f0e885e02eacc0b7cd6a9 (diff) | |
| parent | b139155bee6006f21993f3b2b6bfd5adde6fff6f (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/2configs/buildbot-standalone.nix')
| -rw-r--r-- | lass/2configs/buildbot-standalone.nix | 7 |
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 { |