cros-board: update

[home.git] / .ssh / config

diff --git a/.ssh/config b/.ssh/config
index d7622bd693ba6cc352864bb26f2fb4961e965673..a8614c406defdb55285c6f6d73ff667b12156041 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -4,21 +4,30 @@
 
 #Host *
 #      ControlMaster auto
-#      ControlPath ~/.ssh/cm_socket/%r@%h:%p
+#      ControlPath ~/.ssh/master-%C
 
-Host wh0rd.org
+Host localhost
+       StrictHostKeyChecking no
+
+Host wh0rd.org git.wh0rd.org
+       # For openssh
+       IdentityFile ~/.ssh/id_ed25519.vapier
+       # For dropbear
        IdentityFile ~/.ssh/id_rsa.vapier
 
 Host depot
        User root
        HostName home.wh0rd.org
        Port 443
-       IdentityFile ~/.ssh/id_rsa.vapier
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 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 +40,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
 ###
@@ -93,17 +97,24 @@ Host gshell
        HostName sh.corp.google.com
        User vapier
 
-Host gerrit.chromium.org
-       Port 29418
-       IdentityFile ~/.ssh/id_rsa.google
-Host gerrit-int.chromium.org git.chromium.org review.source.android.com review.coreboot.org
-       Port 29419
-       IdentityFile ~/.ssh/id_rsa.google
-
 Host work
        HostName vapier.cam.corp.google.com
-       RemoteForward 3000 127.0.0.1:1817
-       LocalForward 5901 127.0.0.1:5901
+
+Host lemote
+       HostName 100.100.36.240
+
+Host crosvm
+       Port 9222
+       HostName localhost
+       User root
+       StrictHostKeyChecking no
+       UpdateHostKeys yes
+       UserKnownHostsFile /dev/null
+       IdentityFile ~/.ssh/id_rsa.cros
+
+Host hsm
+       IdentityFile ~/.ssh/id_rsa.google
+       HostName 100.90.28.67
 
 ###
 ### random source systems
@@ -112,8 +123,11 @@ Host work
 Host sourceware.org
        IdentityFile ~/.ssh/id_rsa.vapier
 
+Host github.com
+       IdentityFile ~/.ssh/id_ed25519.vapier
+
 Host uclibc.org
-       IdentityFile ~/.ssh/id_rsa.vapier
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 Host e? e?.enlightenment.org e?v*.enlightenment.org
        User vapier
@@ -145,24 +159,25 @@ 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 tinderbox
-       HostName x86dev.gentoo.osuosl.org
+Host cvs.gentoo.org
+       IdentityFile ~/.ssh/id_ed25519.vapier
+Host git.overlays.gentoo.org
+       IdentityFile ~/.ssh/id_ed25519.vapier
+Host git.gentoo.org
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### ALPHA ###
 
 Host alpha
        HostName monolith.freenet-rz.de
-       IdentityFile ~/.ssh/id_rsa.vapier
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### AMD64 ###
 
@@ -178,7 +193,7 @@ Host coral
 
 Host polyp
        HostName polyp.arm.dev.gentoo.org
-       IdentityFile ~/.ssh/id_rsa.vapier
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### GBSD ###
 
@@ -186,8 +201,15 @@ Host polyp
 ### HPPA ###
 
 Host hake
-       HostName hppa.gentoo.osuosl.org
+       HostName hake.hppa.dev.gentoo.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 ###
 
@@ -196,7 +218,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 ###
 
@@ -205,51 +227,51 @@ 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 ###
 
-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
+       HostName timberdoodle.ppc64.dev.gentoo.org
+       IdentityFile ~/.ssh/id_ed25519.vapier
+
+Host ppcle ppc64le
+       HostName bogsucker.ppc64.dev.gentoo.org
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### 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
+       IdentityFile ~/.ssh/id_ed25519.vapier
+       ControlMaster auto
+       ControlPath ~/.ssh/master-%C
 Host lgentoo4
+       HostName lgentoo4.s390.gentoo.wh0rd.org
        HostName 148.100.88.32
-       IdentityFile ~/.ssh/id_rsa.vapier
-
-Host gentoo01
-       HostName 71
-Host gentoo02
-       HostName 71
+       IdentityFile ~/.ssh/id_ed25519.vapier
+       ControlMaster auto
+       ControlPath ~/.ssh/master-%C
 
 ### SPARC ###
 
 Host sparc
-       HostName bender.sparc.dev.gentoo.org
-       IdentityFile ~/.ssh/id_rsa.vapier
+       HostName catbus.sparc.dev.gentoo.org
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### SH ###
 
 Host lantank
        HostName lantank.sh.dev.gentoo.org
        IdentityFile ~/.ssh/id_rsa.vapier
+
+
+# skey based access:
+# https://chrome-internal.googlesource.com/infra/infra_internal/+/master/doc/ssh_config
+
+# For CrOS gcloud instances:
+# $ ls ~/google-cloud-sdk/bin/gcloud
+# $ curl https://sdk.cloud.google.com | bash
+# $ gcloud compute ssh cros-beefy59-c2