From: Simon Ruderich <simon@ruderich.org>
Date: Sat, 2 Jul 2016 10:05:56 +0000 (+0200)
Subject: ssh_config: store ControlMaster socket in ~/.ssh/master/
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=43fc6ae667ca55c4c3e3a3f1dd0881a7c2c117ce;p=config%2Fdotfiles.git

ssh_config: store ControlMaster socket in ~/.ssh/master/
---

diff --git a/setup.sh b/setup.sh
index c1922a2..2280eab 100755
--- a/setup.sh
+++ b/setup.sh
@@ -286,6 +286,7 @@ if installed htop; then
     link htoprc ~/.config/htop/htoprc
 fi
 if test -d ~/.ssh && test -O ~/.ssh; then
+    mkdir -p ~/.ssh/master
     link ssh_config ~/.ssh/config
 fi
 if installed dig; then
diff --git a/ssh_config b/ssh_config
index 188d925..babd153 100644
--- a/ssh_config
+++ b/ssh_config
@@ -102,7 +102,7 @@ Host *
 # sockets are stored in ~/.ssh (by default ControlPath is not set). Using %r
 # (remote user name) might leak information to other users on the current
 # system (e.g. via netstat or lsof).
-    ControlPath ~/.ssh/master-%l-%h-%p-%r
+    ControlPath ~/.ssh/master/%l-%h-%p-%r
 # Automatically create a new master session if there's none yet or use an
 # existing one. This way the user doesn't have to use -M to enable a master
 # manually. Don't set this option to "yes" or all SSH commands try to become