ssh_config: misc updates

diff --git a/.ssh/config b/.ssh/config
index 9e0b00f6e947040afbfe6a51e588fbbe63ac90df..c8cf4e447b9f3791078de753d92ab6e35db14a61 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -103,9 +103,6 @@ Host gerrit-int.chromium.org git.chromium.org review.source.android.com review.c
 
 Host work
        HostName vapier.cam.corp.google.com
-# SecureShell does this now.
-#      RemoteForward 3000 127.0.0.1:1817
-#      LocalForward 5901 127.0.0.1:5901
 
 ###
 ### random source systems
@@ -114,9 +111,12 @@ Host work
 Host sourceware.org
        IdentityFile ~/.ssh/id_rsa.vapier
 
-Host uclibc.org
+Host github.com
        IdentityFile ~/.ssh/id_rsa.vapier
 
+Host uclibc.org
+       IdentityFile ~/.ssh/id_ed25519.vapier
+
 Host e? e?.enlightenment.org e?v*.enlightenment.org
        User vapier
        ProxyCommand none
@@ -168,7 +168,7 @@ Host tinderbox
 
 Host alpha
        HostName monolith.freenet-rz.de
-       IdentityFile ~/.ssh/id_rsa.vapier
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### AMD64 ###
 
@@ -184,7 +184,7 @@ Host coral
 
 Host polyp
        HostName polyp.arm.dev.gentoo.org
-       IdentityFile ~/.ssh/id_rsa.vapier
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### GBSD ###
 
@@ -193,7 +193,14 @@ Host polyp
 
 Host hake
        HostName hppa.gentoo.osuosl.org
+       IdentityFile ~/.ssh/id_ed25519.vapier
+
+Host hake-console
+       HostName console1.gentoo.osuosl.org
        IdentityFile ~/.ssh/id_rsa.vapier
+       User vapier
+       Port 3003
+       AddressFamily inet
 
 ### IA64 ###
 
@@ -202,7 +209,7 @@ Host beluga
        IdentityFile ~/.ssh/id_rsa.vapier
 Host ia64 guppy
        HostName guppy.ia64.dev.gentoo.org
-       IdentityFile ~/.ssh/id_rsa.vapier
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### M68K ###
 
@@ -216,13 +223,9 @@ Host mips
 
 ### 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
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### S390 ###
 
@@ -235,16 +238,11 @@ Host lgentoo4
        HostName 148.100.88.32
        IdentityFile ~/.ssh/id_rsa.vapier
 
-Host gentoo01
-       HostName 71
-Host gentoo02
-       HostName 71
-
 ### SPARC ###
 
 Host sparc
        HostName bender.sparc.dev.gentoo.org
-       IdentityFile ~/.ssh/id_rsa.vapier
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### SH ###