add aliases for new amd64 box

[home.git] / .ssh / config

diff --git a/.ssh/config b/.ssh/config
index f014573044b5ed590a258da827ca237837061bf4..d8ebb4269a846864ad61ab39e995af43b2611008 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -8,6 +8,7 @@ Host wh0rd.org
 Host depot
        User root
        HostName home.wh0rd.org
+       Port 443
        IdentityFile ~/.ssh/id_dsa.vapier
 
 Host home
@@ -31,8 +32,6 @@ Host wh0rd-admin
        HostName wh0rd.vmadmin.bytemark.co.uk
        IdentityFile ~/.ssh/id_dsa.vapier
 
-
-
 ###
 ### Blackfin systems
 ###
@@ -79,66 +78,6 @@ Host wiki.a.c
        HostName 195.170.124.184
        Port 6589
 
-Host norwood-cvs nwd2cvs1.corp.analog.com
-       User cvsuser
-       HostName nwd2cvs1.corp.analog.com
-       IdentityFile ~/.ssh/id_dsa.adi
-Host shanghai-cvs
-       User root
-       HostName 10.99.22.20
-       ForwardX11 no
-Host shanghai-cvs-ports
-       User root
-       HostName 10.99.22.20
-       ForwardX11 no
-       LocalForward 8079 localhost:8079
-Host shanghai-ports
-       User vapier
-       HostName localhost
-       Port 8079
-       ForwardX11 no
-       DynamicForward 22222
-       LocalForward localhost:1143 nwd2exm5.ad.analog.com:143
-       LocalForward localhost:2225 nwd2exm5.ad.analog.com:25
-
-Host nashua-test
-       User root
-       HostName 10.69.2.210
-       IdentityFile ~/.ssh/id_dsa.adi
-Host nashua-jtag
-       # User adipcadmin
-       User vapier
-       HostName 10.69.2.179
-       IdentityFile ~/.ssh/id_dsa.adi
-
-Host macmini mac-mini
-       HostName 10.99.22.146
-Host osx
-       User blackfin
-       HostName osx.ad.analog.com
-       IdentityFile ~/.ssh/id_dsa.adi
-Host snoopy
-       HostName snoopy.ad.analog.com
-       IdentityFile ~/.ssh/id_dsa.adi
-Host edin
-       HostName edin-manchester.spd.analog.com
-       IdentityFile ~/.ssh/id_dsa.adi
-
-#Host work
-#      HostName 10.8.8.6
-#      HostName localhost
-#      Port 2
-#      HostName 192.168.254.2
-#      ForwardX11 yes
-#Host work-ports
-#      HostName 10.8.8.6
-#      HostName 192.168.254.2
-#      LocalForward 143 nwd2exm5.ad.analog.com:143
-#      LocalForward 25 nwd2exm5.ad.analog.com:25
-#      DynamicForward 8080
-
-
-
 ###
 ### Google systems
 ###
@@ -150,20 +89,12 @@ Host gshell
 Host gerrit.chromium.org
        Port 29418
        IdentityFile ~/.ssh/id_rsa.google
-Host gerrit-int.chromium.org
-       IdentityFile ~/.ssh/id_rsa.google
-
-Host review.source.android.com
-       IdentityFile ~/.ssh/id_rsa.google
-
-Host git.overlays.gentoo.org
+Host gerrit-int.chromium.org git.chromium.org review.source.android.com
        IdentityFile ~/.ssh/id_rsa.google
 
 Host work
        HostName vapier.cam.corp.google.com
 
-
-
 ###
 ### random source systems
 ###
@@ -195,10 +126,7 @@ Host dev-ports
        IdentityFile ~/.ssh/id_dsa.vapier
        LocalForward 127.0.0.1:1111 127.0.0.1:25
 
-Host cvs.gentoo.org
-       IdentityFile ~/.ssh/id_dsa.vapier
-
-Host git.overlays.gentoo.org
+Host cvs.gentoo.org git.overlays.gentoo.org
        IdentityFile ~/.ssh/id_dsa.vapier
 
 Host tinderbox
@@ -209,17 +137,15 @@ Host tinderbox
 Host alpha
        HostName monolith.freenet-rz.de
        IdentityFile ~/.ssh/id_dsa.vapier
-Host gendcc04
-       HostName gendcc04.cs.virginia.edu
-       IdentityFile ~/.ssh/id_dsa.vapier
 
 ### AMD64 ###
 
-Host amd64 poseidon
-       HostName poseidon.amd64.dev.gentoo.org
+Host amd64 skimmer
+       HostName skimmer.gentoo.org
        IdentityFile ~/.ssh/id_dsa.vapier
-Host miranda
-       HostName miranda.amd64.dev.gentoo.org
+
+Host poseidon
+       HostName poseidon.amd64.dev.gentoo.org
        IdentityFile ~/.ssh/id_dsa.vapier
 
 ### ARM ###
@@ -230,11 +156,6 @@ Host coral
 
 ### GBSD ###
 
-Host gbsd
-#      User isis
-#      HostName mail.anyarch.net
-       HostName thepaya.homeip.net
-#      HostName thepaya.is-a-geek.org
 
 ### HPPA ###
 
@@ -253,15 +174,6 @@ Host ia64
 
 ### M68K ###
 
-Host killerhippy
-       Port 1333
-       User mike
-       HostName killerhippy.is-a-geek.org
-
-Host m68k
-       Port 2223
-       HostName bluespice.dyndns.org
-
 Host kolla
        HostName chetter.kolla.no
 
@@ -270,33 +182,16 @@ Host kolla
 Host raq2
        HostName raq2.gentoo.osuosl.org
 
-Host os
-       Port 2222
-       HostName localhost
-
-Host o2k
-       Port 8022
-       User vapier
-       HostName o2k.total-knowledge.com
-
-Host gateway
-       User vapier
-       HostName o2k.total-knowledge.com
-
-Host swarm
-       User vapier
-       HostName swarm.total-knowledge.com
-
-Host eroyf
-       User vapier
-       HostName movidis.mips.dev.hai2u.dk
-
 ### PPC ###
 
 Host ppc
        HostName rooster.ppc64.dev.gentoo.org
        IdentityFile ~/.ssh/id_rsa.vapier
 
+Host ppc2
+       HostName timberdoodle.gentoo.osuosl.org
+       IdentityFile ~/.ssh/id_rsa.vapier
+
 ### S390 ###
 
 Host lgentoo1