ssh_config: update Gentoo systems

[home.git] / .ssh / config

diff --git a/.ssh/config b/.ssh/config
index 24e7039ca2f02c731707f4a6b1e912769d202a5c..a8614c406defdb55285c6f6d73ff667b12156041 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -4,12 +4,12 @@
 
 #Host *
 #      ControlMaster auto
-#      ControlPath ~/.ssh/cm_socket/%r@%h:%p
+#      ControlPath ~/.ssh/master-%C
 
 Host localhost
        StrictHostKeyChecking no
 
-Host wh0rd.org
+Host wh0rd.org git.wh0rd.org
        # For openssh
        IdentityFile ~/.ssh/id_ed25519.vapier
        # For dropbear
@@ -109,8 +109,13 @@ Host crosvm
        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
 ###
@@ -119,7 +124,7 @@ Host sourceware.org
        IdentityFile ~/.ssh/id_rsa.vapier
 
 Host github.com
-       IdentityFile ~/.ssh/id_rsa.vapier
+       IdentityFile ~/.ssh/id_ed25519.vapier
 
 Host uclibc.org
        IdentityFile ~/.ssh/id_ed25519.vapier
@@ -168,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
@@ -199,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
@@ -231,11 +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.gentoo.osuosl.org
+       HostName bogsucker.ppc64.dev.gentoo.org
        IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### S390 ###
@@ -243,16 +245,20 @@ Host ppcle ppc64le
 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 ###
@@ -260,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