merge gentoo ssh config stuff

diff --git a/.ssh/config b/.ssh/config
index d8045a982408a66f019b7f2a69c09495e92d1fa4..4334cca765d7765a3787bd871c659f693e8bc92b 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,88 +1,57 @@
 Host depot
        User root
 
-Host vapier
-       HostName 192.168.0.2
-       User vapier
+Host wh0rd-admin
+       User wh0rd
+       HostName wh0rd.vmadmin.bytemark.co.uk
 
-Host vapier-ports
-       User root
-       HostName vapier
-       LocalForward 5901 127.0.0.1:5901
 
-Host work
-       HostName localhost
-       Port 2
-Host work-ports
-       User root
-       HostName wh0rd.org
-       LocalForward 25 nwd2exm5.ad.analog.com:25
-       LocalForward 143 nwd2exm5.ad.analog.com:143
 
-Host home-ports
-       HostName home.wh0rd.org
-#      HostName 141.154.201.90
-#      HostName 192.168.254.1
-       Port 2
-#      Port 443
-       ForwardX11 no
+###
+### Blackfin systems
+###
+
+Host cvs.blackfin.uclinux.org blackfin.uclinux.org db.blackfin.uclinux.org sources.blackfin.uclinux.org firewall-sources.blackfin.uclinux.org
+       User vapier
+       IdentityFile ~/.ssh/id_dsa.bfin
        Compression yes
-       LocalForward 5900 127.0.0.1:5900
-#      LocalForward 8888 127.0.0.1:8888
-#      DynamicForward 22222
-
-Host home
-       HostName home.wh0rd.org
-#      HostName 141.154.201.90
-#      HostName 192.168.254.1
-#      Port 443
-       Port 2
 
-Host m metro rd-linux-2420
-       HostName 192.168.202.30
-       User root
+Host uboot u-boot www.denx.de
+       User gu-blackfin
+       HostName www.denx.de
+       IdentityFile ~/.ssh/id_dsa.bfin
 
-Host sources.b.u.o
+Host db.b.u.o
        User root
-       HostName sources.blackfin.uclinux.org
-
+       HostName db.blackfin.uclinux.org
+       Port 443
 Host docs.b.u.o
        User root
        HostName docs.blackfin.uclinux.org
-       ForwardX11 yes
-
-Host db.b.u.o
+Host sources.b.u.o
        User root
-       HostName db.blackfin.uclinux.org
-       Port 443
-
-Host firewall-sources.blackfin.uclinux.org firewall-sources.b.u.o sources.blackfin.uclinux.org
+       HostName sources.blackfin.uclinux.org
+Host firewall-sources.b.u.o
+       User root
+       HostName firewall-sources.blackfin.uclinux.org
        Port 443
+Host firewall-sources.blackfin.uclinux.org
        User vapier
-       #HostName firewall-sources.blackfin.uclinux.org
-       HostName 204.50.165.246
-       IdentityFile ~/.ssh/id_dsa.bfin
-
-Host www.denx.de
-       User gu-blackfin
-       HostName www.denx.de
+       Port 443
        IdentityFile ~/.ssh/id_dsa.bfin
 
 Host norwood-cvs nwd2cvs1.corp.analog.com
        User cvsuser
        HostName nwd2cvs1.corp.analog.com
-
 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
@@ -91,36 +60,153 @@ Host shanghai-ports
        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
 
-Host fpga
-       User mfrysin
-       HostName 65.90.9.117
-       Port 443
-       IdentityFile ~/.ssh/id_dsa.bfin
+Host work
+       HostName localhost
+       Port 2
+#      HostName 192.168.254.2
+#      ForwardX11 yes
+Host work-ports
+       HostName wh0rd.org
+#      HostName 192.168.254.2
+       LocalForward 143 nwd2exm5.ad.analog.com:143
+       LocalForward 25 nwd2exm5.ad.analog.com:25
+       DynamicForward 192.168.0.2:8080
+
 
-Host git.overlays.gentoo.org ltp.cvs.sourceforge.net console1.gentoo.osuosl.org svn.gentoo.org
-       IdentityFile ~/.ssh/id_dsa.vapier
-Host dev dev.gentoo.org
+
+###
+### Gentoo systems
+###
+
+# then at runtime, do:
+# ssh -M -N -f vapier@cvs.gentoo.org
+#Host cvs.gentoo.org
+#      ControlMaster auto
+#      ControlPath ~/.ssh/master-%r@%h:%p
+#Host cvs.gentoo.org svn.gentoo.org
+#      ProxyCommand ssh -a vapier@dev.gentoo.org /usr/bin/nc -q2 %h %p
+
+Host dev
        HostName dev.gentoo.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+
 Host dev-ports
        HostName dev.gentoo.org
-       IdentityFile ~/.ssh/id_dsa.vapier
        LocalForward 127.0.0.1:1111 127.0.0.1:25
 
+Host tinderbox
+       HostName x86dev.gentoo.osuosl.org
+
+### ALPHA ###
+
+Host alpha
+       HostName monolith.freenet-rz.de
+Host gendcc04
+       HostName gendcc04.cs.virginia.edu
+
+### AMD64 ###
+
+Host amd64 poseidon
+       HostName poseidon.amd64.dev.gentoo.org
+Host miranda
+       HostName miranda.amd64.dev.gentoo.org
+
+### ARM ###
+
+Host coral
+       HostName coral.gentoo.osuosl.org
+
+### GBSD ###
+
+Host gbsd
+#      User isis
+#      HostName mail.anyarch.net
+       HostName thepaya.homeip.net
+#      HostName thepaya.is-a-geek.org
+
+### HPPA ###
+
+Host hake
+       HostName hppa.gentoo.osuosl.org
+
+### IA64 ###
+
+Host beluga
+       HostName beluga.ia64.dev.gentoo.org
+Host ia64
+       HostName i2.gentoo.osuosl.org
+
+### 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
+
+### MIPS ###
+
+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 luna.gentoo.osuosl.org
+
+### S390 ###
+
+#      x3270 -sb -sl 1024 localhost:2320
+#      ssh -N -f -L 2320:192.168.44.20:23 vmgate.zseries.org -l vapier
+Host vmgate-ports
+       HostName vmgate.zseries.org
+       LocalForward 2320 192.168.44.20:23
 Host gentoo01
        HostName gentoo01.zseries.org
-       IdentityFile ~/.ssh/id_dsa.vapier
 Host gentoo02
        HostName gentoo02.zseries.org
-       IdentityFile ~/.ssh/id_dsa.vapier
 Host gentoo03
        HostName gentoo03.zseries.org
-       IdentityFile ~/.ssh/id_dsa.vapier
 Host gentoo04
        HostName gentoo04.zseries.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+
+### SPARC ###
+
+Host sparc
+       HostName bender.sparc.dev.gentoo.org
+       Port 2223
+
+### SH ###
+
+Host lantank
+       HostName lantank.sh.dev.gentoo.org