ssh_config: update Gentoo systems

[home.git] / .ssh / config

diff --git a/.ssh/config b/.ssh/config
index a5e1813cc66d9109b6155317b93d2bbe76a92d0b..a8614c406defdb55285c6f6d73ff667b12156041 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -4,9 +4,12 @@
 
 #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
@@ -16,7 +19,7 @@ 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
@@ -98,7 +101,20 @@ Host work
        HostName vapier.cam.corp.google.com
 
 Host lemote
-       HostName 172.29.72.35
+       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
@@ -108,7 +124,7 @@ Host sourceware.org
        IdentityFile ~/.ssh/id_rsa.vapier
 
 Host github.com
-       IdentityFile ~/.ssh/id_rsa
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 Host uclibc.org
        IdentityFile ~/.ssh/id_ed25519.vapier
@@ -157,9 +173,6 @@ Host git.overlays.gentoo.org
 Host git.gentoo.org
        IdentityFile ~/.ssh/id_ed25519.vapier
 
-Host tinderbox
-       HostName x86dev.gentoo.osuosl.org
-
 ### ALPHA ###
 
 Host alpha
@@ -188,7 +201,7 @@ Host polyp
 ### HPPA ###
 
 Host hake
-       HostName hppa.gentoo.osuosl.org
+       HostName hake.hppa.dev.gentoo.org
        IdentityFile ~/.ssh/id_ed25519.vapier
 
 Host hake-console
@@ -220,7 +233,11 @@ Host mips
 ### PPC ###
 
 Host ppc ppc64
-       HostName timberdoodle.gentoo.osuosl.org
+       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 ###
@@ -228,16 +245,20 @@ Host ppc ppc64
 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
+       IdentityFile ~/.ssh/id_ed25519.vapier
+       ControlMaster auto
+       ControlPath ~/.ssh/master-%C
 
 ### SPARC ###
 
 Host sparc
-       HostName bender.sparc.dev.gentoo.org
+       HostName catbus.sparc.dev.gentoo.org
        IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### SH ###
@@ -245,3 +266,12 @@ Host sparc
 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