remove obsolete entries, add warthogs/ubuntu stuff

git-svn-id: file:///svn/tfheen/trunk/dotfiles@720 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf

diff --git a/ssh/config b/ssh/config
index b16a26084f34b049539c155f4cb09f4a39a9d694..c9ee0e938e2c6d52fc3f94312e4d8d497d5c437a 100644 (file)
--- a/ssh/config
+++ b/ssh/config
@@ -68,7 +68,7 @@ Host tank
 Hostname bergljot.dyndns.org
 
 Host vawad
-Hostname vawad.raw.no
+Hostname vawad.err.no
 
 Host vier
 Hostname vier.idi.ntnu.no
@@ -164,8 +164,14 @@ Port 23
 HostKeyAlias golem.intern.err.no
 CheckHostIP no
 
-Host golem-eth0
-Hostname home.err.no
-Port 24
-HostKeyAlias golem-eth0.intern.raw.no
-CheckHostIP no
+Host shonap
+Hostname shonap.err.no
+
+# Canonical
+
+Host chinstrap.warthogs.hbd.com
+ProxyCommand none
+
+Host *.ubuntu.com *.warthogs.hbd.com
+ProxyCommand ssh -q -a -x chinstrap.warthogs.hbd.com nc -q0 %h 22
+