Cleanup ssh config

1 files changed, 56 insertions, 41 deletions

diff --git a/.ssh/config b/.ssh/config
index db83e82..0a514d6 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -3,50 +3,65 @@ VisualHostKey yes
 CheckHostIP yes
 NoHostAuthenticationForLocalhost yes
 
+## Debian hosts
+Host master ravel alioth
+     HostName %h.debian.org
+Host *.debian.net
+     User rak
+Host *.debian.org master ravel alioth
+     User rak
+     StrictHostKeyChecking yes
+     UserKnownHostsFile ~/.ssh/known_hosts.d/debian
+## QueensU hosts
 Host w310
-    HostName w310-181.caslab.queensu.ca
+     HostName w310-181.caslab.queensu.ca
 Host ciscwww
-    HostName ciscwww.cs.queensu.ca
-Host cub
-    Hostname ubuntu.caslab.queensu.ca
-    User ryanak
-Host ubuntu.caslab.queensu.ca
-    User ryanak
-Host pinky
-    Hostname pinky.cs.queensu.ca
-Host brain
-    Hostname brain.cs.queensu.ca
-Host puc
-    Hostname people.ubuntu.com
-    User ryanakca
-Host ml
-    Hostname ftp.mathslibres.com
-    User mathslib
-Host athena
-    Hostname athena.caslab.queensu.ca
-Host mit-athena
-    Hostname athena.dialup.mit.edu
-Host people.ubuntu.com
-    User ryanakca
-Host *.caslab.queensu.ca
+     HostName ciscwww.cs.queensu.ca
+Host ubuntu ubuntu.caslab.queensu.ca
+     HostName ubuntu.caslab.queensu.ca
+     User ryanak
+Host pinky brain
+     HostName %h.cs.queensu.ca
+Host athena athena.caslab.queensu.ca
+     HostName athena.caslab.queensu.ca
+     User ryan
+Host linux1 hera zeus
+     HostName %h.caslab.queensu.ca
+Host *.caslab.queensu.ca w310 ubuntu athena linux1 hera zeus
     User ryankca
-    UserKnownHostsFile ~/.ssh/known_hosts.d/caslab
-Host *.debian.net
-    User rak
-Host *.debian.org
-    User rak
-    StrictHostKeyCHecking yes
-    UserKnownHostsFile ~/.ssh/known_hosts.d/debian
-Host anonscm.debian.org
-    Hostname alioth.debian.org
+Host *.cs.queensu.ca ciscwww pinky brain
+     User ryan
+Host *.queensu.ca w310 ubuntu athena linux1 hera zeus ciscwww pinky brain
+     StrictHostKeyChecking yes
+     UserKnownHostsFile ~/.ssh/known_hosts.d/queensu.ca
+## MIT hosts
+Host mit-athena
+     HostName athena.dialup.mit.edu
+Host all-night-tool
+     HostName %h.mit.edu
+Host *.mit.edu mit-athena all-night-tool
+     User rakavan
+     StrictHostKeyChecking yes
+     UserKnownHostsFile ~/.ssh/known_hosts.d/mit.edu
+## McGill hosts
 Host *.cs.mcgill.ca
     User ryank
-    UserKnownHostsFile ~/.ssh/known_hosts.d/cs.queensu.ca
-Host upsilon
-    Hostname upsilon.ryanak.ca
-Host ryanak.ca *.ryanak.ca
-    UserKnownHostsFile ~/.ssh/known_hosts.d/ryanak.ca
-Host *.mit.edu
-    User rakavan
     StrictHostKeyChecking yes
-    UserKnownHostsFile ~/.ssh/known_hosts.d/mit.edu
+    UserKnownHostsFile ~/.ssh/known_hosts.d/cs.mcgill.ca
+## Ubuntu hosts
+Host puc
+    Hostname people.ubuntu.com
+    User ryanakca
+## ryanak.ca hosts
+Host epsilon
+     HostName epsilon.ryanak.ca
+Host upsilon
+     HostName upsilon.ryanak.ca
+Host nu
+     HostName nu.ryanak.ca
+Host ryanak.ca *.ryanak.ca epsilon upsilon nu
+     UserKnownHostsFile ~/.ssh/known_hosts.d/ryanak.ca
+     StrictHostKeyChecking yes
+## Global defaults
+Host *
+     ForwardX11 no