ssh_config: forward gnubby when possible

[home.git] / .ssh / config

diff --git a/.ssh/config b/.ssh/config
index 4465032d50fbe44fce819bbbd01e82921a1b956d..7722bc8dd68d2186dd22d42061c781543b4bf80d 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -3,13 +3,13 @@
 # also enable NoneEnabled on server side
 
 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
@@ -95,6 +95,8 @@ 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
@@ -104,7 +106,7 @@ Host sourceware.org
        IdentityFile ~/.ssh/id_dsa.vapier
 
 Host uclibc.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 ###
 ### Gentoo systems
@@ -112,23 +114,23 @@ Host uclibc.org
 
 # 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 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
+       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 git.overlays.gentoo.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 Host tinderbox
        HostName x86dev.gentoo.osuosl.org
@@ -157,7 +159,7 @@ Host coral
 
 Host polyp
        HostName polyp.arm.dev.gentoo.org
-       IdentityFile ~/.ssh/id_dsa.vapier
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 ### GBSD ###
 
@@ -166,16 +168,16 @@ Host polyp
 
 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 ###
 
@@ -209,6 +211,12 @@ Host lgentoo1
 Host lgentoo2
        HostName 148.100.96.98
        IdentityFile ~/.ssh/id_rsa.vapier
+Host lgentoo3
+       HostName 148.100.88.31
+       IdentityFile ~/.ssh/id_rsa.vapier
+Host lgentoo4
+       HostName 148.100.88.32
+       IdentityFile ~/.ssh/id_rsa.vapier
 
 Host gentoo01
        HostName 71
@@ -220,10 +228,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