]> git.wh0rd.org - home.git/blobdiff - .ssh/config
git.wh0rd.org / home.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ssh: use new key for git.gentoo
[home.git] / .ssh / config
diff --git a/.ssh/config b/.ssh/config
index b39c86c3cd1965377ac0fa1f24e53e5de833f352..397f6b6c3c8b3b7074664bfc1edc2a9ee59de1df 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -2,14 +2,18 @@
 # scp -oNoneEnabled=yes -oNoneSwitch=yes
 # also enable NoneEnabled on server side
 
+#Host *
+#      ControlMaster auto
+#      ControlPath ~/.ssh/cm_socket/%r@%h:%p
+
 Host wh0rd.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 Host depot
        User root
        HostName home.wh0rd.org
        Port 443
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 Host home
        HostName home.wh0rd.org
@@ -30,9 +34,7 @@ Host dir-825
 Host wh0rd-admin
        User wh0rd
        HostName wh0rd.vmadmin.bytemark.co.uk
-       IdentityFile ~/.ssh/id_dsa.vapier
-
-
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 ###
 ### Blackfin systems
@@ -48,9 +50,12 @@ Host uboot u-boot www.denx.de
        IdentityFile ~/.ssh/id_dsa.bfin
        HostName www.denx.de
 
-Host ra.kernel.org
-       User gitolite
-       IdentityFile ~/.ssh/id_rsa.kernel.org
+Host gitolite.kernel.org
+       User git
+       IdentityFile ~/.ssh/limited/id_rsa.kernel.org
+
+Host kup.kernel.org
+       IdentityFile ~/.ssh/limited/id_rsa.kernel.org
 
 Host db.b.u.o
        User root
@@ -80,66 +85,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
 ###
@@ -151,58 +96,66 @@ Host gshell
 Host gerrit.chromium.org
        Port 29418
        IdentityFile ~/.ssh/id_rsa.google
-Host gerrit-int.chromium.org
-       IdentityFile ~/.ssh/id_rsa.google
-Host git.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 review.coreboot.org
+       Port 29419
        IdentityFile ~/.ssh/id_rsa.google
 
 Host work
        HostName vapier.cam.corp.google.com
-
-
+       RemoteForward 3000 127.0.0.1:1817
+       LocalForward 5901 127.0.0.1:5901
 
 ###
 ### random source systems
 ###
 
 Host sourceware.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 Host uclibc.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
+
+Host e? e?.enlightenment.org e?v*.enlightenment.org
+       User vapier
+       ProxyCommand none
+
+Host git.enlightenment.org
+       User git
+       ProxyCommand none
+
+Host *.enlightenment.org
+       User vapier
+       ProxyCommand ssh -q e5v1.enlightenment.org -W %h:%p
 
 ###
 ### 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
+# ssh -N -f -n master-cvs.gentoo.org
+Host master-cvs.gentoo.org
+       HostName cvs.gentoo.org
+       User vapier
+       ControlMaster yes
+       ControlPath ~/.ssh/master-%l-%r@%h:%p
+Host cvs.gentoo.org
+       ControlMaster no
+       ControlPath ~/.ssh/master-%l-%r@%h:%p
+       BatchMode yes
 
 Host dev
        HostName dev.gentoo.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 Host dev-ports
        HostName dev.gentoo.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
        LocalForward 127.0.0.1:1111 127.0.0.1:25
 
 Host cvs.gentoo.org
-       IdentityFile ~/.ssh/id_dsa.vapier
-
+       IdentityFile ~/.ssh/id_rsa.vapier
 Host git.overlays.gentoo.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 Host tinderbox
        HostName x86dev.gentoo.osuosl.org
@@ -211,60 +164,44 @@ 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
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 ### AMD64 ###
 
-Host amd64 poseidon
-       HostName poseidon.amd64.dev.gentoo.org
-       IdentityFile ~/.ssh/id_dsa.vapier
-Host miranda
-       HostName miranda.amd64.dev.gentoo.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+Host amd64
+       HostName nightheron.gentoo.org
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 ### ARM ###
 
 Host coral
        HostName coral.gentoo.osuosl.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
+
+Host polyp
+       HostName polyp.arm.dev.gentoo.org
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 ### 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
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 ### IA64 ###
 
 Host beluga
        HostName beluga.ia64.dev.gentoo.org
-       IdentityFile ~/.ssh/id_dsa.vapier
-Host ia64
-       HostName i2.gentoo.osuosl.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
+Host ia64 guppy
+       HostName guppy.ia64.dev.gentoo.org
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 ### 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
 
@@ -273,33 +210,20 @@ 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
+Host mips
+       HostName 108.161.26.171
+       Port 9240
 
 ### PPC ###
 
-Host ppc
+Host ppc2
        HostName rooster.ppc64.dev.gentoo.org
        IdentityFile ~/.ssh/id_rsa.vapier
 
+Host ppc ppc64
+       HostName timberdoodle.gentoo.osuosl.org
+       IdentityFile ~/.ssh/id_rsa.vapier
+
 ### S390 ###
 
 Host lgentoo1
@@ -308,6 +232,14 @@ Host lgentoo1
 Host lgentoo2
        HostName 148.100.96.98
        IdentityFile ~/.ssh/id_rsa.vapier
+Host lgentoo3
+       HostName lgentoo3.s390.gentoo.wh0rd.org
+       HostName 148.100.88.31
+       IdentityFile ~/.ssh/id_rsa.vapier
+Host lgentoo4
+       HostName lgentoo4.s390.gentoo.wh0rd.org
+       HostName 148.100.88.32
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 Host gentoo01
        HostName 71
@@ -318,11 +250,10 @@ Host gentoo02
 
 Host sparc
        HostName bender.sparc.dev.gentoo.org
-       Port 2223
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 ### SH ###
 
 Host lantank
        HostName lantank.sh.dev.gentoo.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
my ~/