ssh: use new key for git.gentoo

[home.git] / .ssh / config

diff --git a/.ssh/config b/.ssh/config
index 7f63562ffc007a6dad0e300d2bd8a45404b72c5d..397f6b6c3c8b3b7074664bfc1edc2a9ee59de1df 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -2,6 +2,10 @@
 # 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_rsa.vapier
 
@@ -30,7 +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
@@ -46,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
@@ -95,28 +102,46 @@ Host gerrit-int.chromium.org git.chromium.org review.source.android.com review.c
 
 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_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
+# 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 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
+       ControlMaster no
+       ControlPath ~/.ssh/master-%l-%r@%h:%p
+       BatchMode yes
 
 Host dev
        HostName dev.gentoo.org
@@ -127,7 +152,9 @@ Host dev-ports
        IdentityFile ~/.ssh/id_rsa.vapier
        LocalForward 127.0.0.1:1111 127.0.0.1:25
 
-Host cvs.gentoo.org git.overlays.gentoo.org
+Host cvs.gentoo.org
+       IdentityFile ~/.ssh/id_rsa.vapier
+Host git.overlays.gentoo.org
        IdentityFile ~/.ssh/id_rsa.vapier
 
 Host tinderbox
@@ -137,23 +164,19 @@ Host tinderbox
 
 Host alpha
        HostName monolith.freenet-rz.de
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 ### AMD64 ###
 
-Host amd64 skimmer
-       HostName skimmer.gentoo.org
-       IdentityFile ~/.ssh/id_dsa.vapier
-
-Host poseidon
-       HostName poseidon.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
@@ -210,9 +233,11 @@ 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
 
@@ -225,7 +250,6 @@ Host gentoo02
 
 Host sparc
        HostName bender.sparc.dev.gentoo.org
-       Port 2223
        IdentityFile ~/.ssh/id_rsa.vapier
 
 ### SH ###