diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2015-09-19 15:49:29 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2015-09-19 15:49:29 -0400 |
commit | 118f849aed5aef3bf2750ca102007b4a38e44486 (patch) | |
tree | 47eb202ab5e4ed21a43122a44ed331e76a7bf258 /.config/ssh/config | |
parent | 739fa0ff2b7b0581b2d294f8de8b9e79234ed66c (diff) | |
parent | 641fc49fc651b6a67fb8ff90198e889e0e3920bb (diff) |
Merge remote-tracking branch 'origin/master' into purdue-cs/master
# Conflicts:
# .config/X11/clientrc
# .config/bash/rc.sh
# .config/cron/make-config
# .config/emacs/custom.el
# .config/emacs/init.el
# .config/login.d/10_selected-editor.sh
# .config/login.sh
Diffstat (limited to '.config/ssh/config')
-rw-r--r-- | .config/ssh/config | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/.config/ssh/config b/.config/ssh/config index 07240a6..dc32703 100644 --- a/.config/ssh/config +++ b/.config/ssh/config @@ -6,10 +6,9 @@ Host * # Purdue ################################################### -Host lore - HostName lore.cs.purdue.edu -Host data - HostName data.cs.purdue.edu +Host data lore borg?? xinu?? sac?? sslab?? moore?? + HostName %h.cs.purdue.edu + User shumakl Host *.cs.purdue.edu User shumakl @@ -25,16 +24,14 @@ Host lukeshu.com Port 1863 User lukeshu +Match host build64-par exec "host %n.lan." + HostName build64-par + Port 22 + ForwardX11 yes + ForwardX11Trusted yes Host build64-par User luke - HostName lukeshu.com Port 1864 ForwardX11 no ForwardX11Trusted no - - Match host %h.lan. - HostName build64-par - Port 22 - ForwardX11 yes - ForwardX11Trusted yes |