X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=remote%2Fssh;h=d6bea1ef07661cf3917d9046b7751aca78cf63fd;hp=2ebd54255ee1702c907e36c05a8d70c9b1b20abe;hb=83b3ca83e8d9f263b25052cc1be78af145623857;hpb=3ad6118386977e346d81042e924e5db9c5f15b7d

diff --git a/remote/ssh b/remote/ssh
index 2ebd542..d6bea1e 100755
--- a/remote/ssh
+++ b/remote/ssh
@@ -1,7 +1,16 @@
-#!/bin/sh -eux
-tool=${0%/*}/..
+#!/bin/sh -eu
+tool=$(readlink -e "${0%/*}/..")
+. "$tool"/remote/lib.sh
+
+install -d -m 750 \
+ "$tool"/var/run \
+ "$tool"/var/run/ssh
 ssh \
- -o StrictHostKeyChecking=yes \
- -o UserKnownHostsFile="$tool"/etc/openssh/known_hosts \
+ -F "$tool"/etc/ssh/remote.conf \
+ -o ControlMaster=autoask \
+ -o ControlPath="$tool"/var/run/ssh/"%h-%p-%r" \
+ -o ControlPersist=no \
  -o HashKnownHosts=no \
- "$@"
+ -o StrictHostKeyChecking=yes \
+ -o UserKnownHostsFile="$tool"/etc/ssh/known_hosts \
+ "${@:-$local_ipv4}"