X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.ssh%2Fconfig;h=abf834d38eac3d1f74f69f4be8882b23a265e2b8;hb=fb5d2cb632ad05e57c8b257f5a3c85bb75c8ac31;hp=c8cf4e447b9f3791078de753d92ab6e35db14a61;hpb=4f66813bbfaab6c4bc53c51adcc3aa01f124a2d2;p=home.git

diff --git a/.ssh/config b/.ssh/config
index c8cf4e4..abf834d 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -4,7 +4,10 @@
 
 #Host *
 #	ControlMaster auto
-#	ControlPath ~/.ssh/cm_socket/%r@%h:%p
+#	ControlPath ~/.ssh/master-%C
+
+Host localhost
+	StrictHostKeyChecking no
 
 Host wh0rd.org
 	# For openssh
@@ -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
@@ -94,16 +97,25 @@ 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
 
+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,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
@@ -227,16 +239,20 @@ Host ppc ppc64
 	HostName timberdoodle.gentoo.osuosl.org
 	IdentityFile ~/.ssh/id_ed25519.vapier
 
+Host ppcle ppc64le
+	HostName bogsucker.gentoo.osuosl.org
+	IdentityFile ~/.ssh/id_ed25519.vapier
+
 ### S390 ###
 
 Host lgentoo3
 	HostName lgentoo3.s390.gentoo.wh0rd.org
 	HostName 148.100.88.31
-	IdentityFile ~/.ssh/id_rsa.vapier
+	IdentityFile ~/.ssh/id_ed25519.vapier
 Host lgentoo4
 	HostName lgentoo4.s390.gentoo.wh0rd.org
 	HostName 148.100.88.32
-	IdentityFile ~/.ssh/id_rsa.vapier
+	IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### SPARC ###
 
@@ -249,3 +265,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