ssh: switch to ed25519 keys

[home.git] / .ssh / config

diff --git a/.ssh/config b/.ssh/config
index d7622bd693ba6cc352864bb26f2fb4961e965673..89677897833612d423f62658cebc1f4737f0777e 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -7,6 +7,9 @@
 #      ControlPath ~/.ssh/cm_socket/%r@%h:%p
 
 Host wh0rd.org
+       # For openssh
+       IdentityFile ~/.ssh/id_ed25519.vapier
+       # For dropbear
        IdentityFile ~/.ssh/id_rsa.vapier
 
 Host depot
@@ -19,6 +22,9 @@ Host home
        HostName home.wh0rd.org
        Port 443
 
+Host bos.wh0rd.org
+       Port 443
+
 Host home-ports
        HostName vpn-vapier-m
        #HostName home.wh0rd.org
@@ -31,11 +37,6 @@ Host dir-825
        HostName 192.168.0.250
        IdentityFile ~/.ssh/id_dsa.vapier
 
-Host wh0rd-admin
-       User wh0rd
-       HostName wh0rd.vmadmin.bytemark.co.uk
-       IdentityFile ~/.ssh/id_rsa.vapier
-
 ###
 ### Blackfin systems
 ###
@@ -102,8 +103,9 @@ 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
+# SecureShell does this now.
+#      RemoteForward 3000 127.0.0.1:1817
+#      LocalForward 5901 127.0.0.1:5901
 
 ###
 ### random source systems
@@ -145,15 +147,17 @@ Host cvs.gentoo.org
 
 Host dev
        HostName dev.gentoo.org
-       IdentityFile ~/.ssh/id_rsa.vapier
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 Host dev-ports
        HostName dev.gentoo.org
-       IdentityFile ~/.ssh/id_rsa.vapier
+       IdentityFile ~/.ssh/id_ed25519.vapier
        LocalForward 127.0.0.1:1111 127.0.0.1:25
 
-Host cvs.gentoo.org git.overlays.gentoo.org
-       IdentityFile ~/.ssh/id_rsa.vapier
+Host cvs.gentoo.org
+       IdentityFile ~/.ssh/id_ed25519.vapier
+Host git.overlays.gentoo.org
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 Host tinderbox
        HostName x86dev.gentoo.osuosl.org
@@ -205,12 +209,8 @@ Host kolla
 
 ### MIPS ###
 
-Host raq2
-       HostName raq2.gentoo.osuosl.org
-
 Host mips
-       HostName 108.161.26.171
-       Port 9240
+       HostName fulong-spark.mips64.dev.gentoo.org
 
 ### PPC ###
 
@@ -224,16 +224,12 @@ Host ppc ppc64
 
 ### S390 ###
 
-Host lgentoo1
-       HostName 148.100.96.97
-       IdentityFile ~/.ssh/id_rsa.vapier
-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