diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2015-02-16 11:37:46 -0500 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2015-02-16 11:37:46 -0500 |
commit | 7a2dd3a7e3f465141c90abedcb814f9ee9712edd (patch) | |
tree | 78a4911e665d84fc44d365573d24c593c705813e /.config/ssh | |
parent | c8f419eab92045a069c8f444c77c8ff81aa36fa2 (diff) | |
parent | ca3e04971996ebe2eebf88775e96bbf547aa0abe (diff) |
Merge remote-tracking branch 'origin/master' into purdue-cs/master
Conflicts:
.config/login.d/02_tmpdir.sh
.config/login.d/90_dot-runtime.sh
Diffstat (limited to '.config/ssh')
-rw-r--r-- | .config/ssh/config | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/.config/ssh/config b/.config/ssh/config index 4a58c28..07240a6 100644 --- a/.config/ssh/config +++ b/.config/ssh/config @@ -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 |