Correction : remote/gpg-gen-key : typo.

[lhc/ateliers.git] / remote / ssh

diff --git a/remote/ssh b/remote/ssh
index 2ebd542..2bacc68 100755 (executable)
--- a/remote/ssh
+++ b/remote/ssh
@@ -1,7 +1,17 @@
-#!/bin/sh -eux
-tool=${0%/*}/..
+#!/bin/sh -eu
+tool=$(readlink -e "${0%/*}/..")
+. "$tool"/remote/lib.sh
+
+install -d -m 770 \
+ "$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 HashKnownHosts=no \
- "$@"
+ -o StrictHostKeyChecking=yes \
+ -o UserKnownHostsFile="$tool"/etc/ssh/known_hosts \
+ "${@:-$local_ipv4}"
+# NOTE: pas dans le ssh de squeeze :
+ #-o ControlPersist=no \