update ssh config

diff --git a/.ssh/config b/.ssh/config
index 7722bc8dd68d2186dd22d42061c781543b4bf80d..d3de6f5ed118b9128c8ef88c9cc5450769f68c3a 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
@@ -103,7 +110,7 @@ Host work
 ###
 
 Host sourceware.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 Host uclibc.org
        IdentityFile ~/.ssh/id_rsa.vapier
@@ -117,7 +124,8 @@ Host uclibc.org
 Host cvs.gentoo.org
        ControlMaster auto
        ControlPath ~/.ssh/master-%r@%h:%p
-Host cvs.gentoo.org svn.gentoo.org
+# svn.gentoo.org
+Host cvs.gentoo.org
        ProxyCommand ssh -a vapier@dev.gentoo.org /usr/bin/nc -q2 %h %p
 
 Host dev
@@ -139,23 +147,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
+       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
@@ -227,7 +231,6 @@ Host gentoo02
 
 Host sparc
        HostName bender.sparc.dev.gentoo.org
-       Port 2223
        IdentityFile ~/.ssh/id_rsa.vapier
 
 ### SH ###