summaryrefslogtreecommitdiff
path: root/.config/ssh
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-02-09 22:51:14 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-02-09 22:51:14 -0500
commit66c5faa2bce8809a1e7e90eec0542b4de07915df (patch)
tree36744580a3081f482fe0ee28428f24f664ec5202 /.config/ssh
parentf9232bbdeeb4000d7b89b8a59d591b787266c24b (diff)
parentca3e04971996ebe2eebf88775e96bbf547aa0abe (diff)
Merge remote-tracking branch 'origin/master' into build64-par/master
Diffstat (limited to '.config/ssh')
-rw-r--r--.config/ssh/config17
1 files changed, 10 insertions, 7 deletions
diff --git a/.config/ssh/config b/.config/ssh/config
index 7bab06d..07240a6 100644
--- a/.config/ssh/config
+++ b/.config/ssh/config
@@ -1,7 +1,7 @@
Host *
Protocol 2
ControlMaster auto
- ControlPath ~/.runtime/ssh-%r@%h:%p
+ ControlPath ~/.runtime/%l/ssh-%r@%h:%p
Compression yes
# Purdue ###################################################
@@ -26,12 +26,15 @@ Host lukeshu.com
User lukeshu
Host build64-par
- Port 22
User luke
- ForwardX11 yes
- ForwardX11Trusted yes
-Host build64-par-far
- Port 1864
HostName lukeshu.com
- User luke
+ Port 1864
+ ForwardX11 no
+ ForwardX11Trusted no
+
+ Match host %h.lan.
+ HostName build64-par
+ Port 22
+ ForwardX11 yes
+ ForwardX11Trusted yes