X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.ssh%2Fconfig;h=90c0624da16bd33b44b0631946296aa9b81ac76e;hb=db67115d46992c8929a99d3159037ddee73db1d0;hp=d8ebb4269a846864ad61ab39e995af43b2611008;hpb=d02b5f408dcd0f5f0607a798ff6378b61ca96de0;p=home.git

diff --git a/.ssh/config b/.ssh/config
index d8ebb42..90c0624 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -2,19 +2,32 @@
 # scp -oNoneEnabled=yes -oNoneSwitch=yes
 # also enable NoneEnabled on server side
 
+#Host *
+#	ControlMaster auto
+#	ControlPath ~/.ssh/cm_socket/%r@%h:%p
+
+Host localhost
+	StrictHostKeyChecking no
+
 Host wh0rd.org
-	IdentityFile ~/.ssh/id_dsa.vapier
+	# 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_dsa.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
@@ -27,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_dsa.vapier
-
 ###
 ### Blackfin systems
 ###
@@ -46,9 +54,12 @@ Host uboot u-boot www.denx.de
 	IdentityFile ~/.ssh/id_dsa.bfin
 	HostName www.denx.de
 
-Host ra.kernel.org
-	User gitolite
-	IdentityFile ~/.ssh/id_rsa.kernel.org
+Host gitolite.kernel.org
+	User git
+	IdentityFile ~/.ssh/limited/id_rsa.kernel.org
+
+Host kup.kernel.org
+	IdentityFile ~/.ssh/limited/id_rsa.kernel.org
 
 Host db.b.u.o
 	User root
@@ -86,48 +97,80 @@ 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
-	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
+	IdentityFile ~/.ssh/id_rsa.cros
+
+Host hsm
+	IdentityFile ~/.ssh/id_rsa.google
+	HostName 100.110.253.170
+
 ###
 ### random source systems
 ###
 
 Host sourceware.org
-	IdentityFile ~/.ssh/id_dsa.vapier
+	IdentityFile ~/.ssh/id_rsa.vapier
+
+Host github.com
+	IdentityFile ~/.ssh/id_ed25519.vapier
 
 Host uclibc.org
-	IdentityFile ~/.ssh/id_dsa.vapier
+	IdentityFile ~/.ssh/id_ed25519.vapier
+
+Host e? e?.enlightenment.org e?v*.enlightenment.org
+	User vapier
+	ProxyCommand none
+
+Host git.enlightenment.org
+	User git
+	ProxyCommand none
+
+Host *.enlightenment.org
+	User vapier
+	ProxyCommand ssh -q e5v1.enlightenment.org -W %h:%p
 
 ###
 ### Gentoo systems
 ###
 
 # then at runtime, do:
-# ssh -M -N -f vapier@cvs.gentoo.org
-#Host cvs.gentoo.org
-#	ControlMaster auto
-#	ControlPath ~/.ssh/master-%r@%h:%p
-#Host cvs.gentoo.org svn.gentoo.org
-#	ProxyCommand ssh -a vapier@dev.gentoo.org /usr/bin/nc -q2 %h %p
+# ssh -N -f -n master-cvs.gentoo.org
+Host master-cvs.gentoo.org
+	HostName cvs.gentoo.org
+	User vapier
+	ControlMaster yes
+	ControlPath ~/.ssh/master-%l-%r@%h:%p
+Host cvs.gentoo.org
+	ControlMaster no
+	ControlPath ~/.ssh/master-%l-%r@%h:%p
+	BatchMode yes
 
 Host dev
 	HostName dev.gentoo.org
-	IdentityFile ~/.ssh/id_dsa.vapier
+	IdentityFile ~/.ssh/id_ed25519.vapier
 
 Host dev-ports
 	HostName dev.gentoo.org
-	IdentityFile ~/.ssh/id_dsa.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_dsa.vapier
+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
 
 Host tinderbox
 	HostName x86dev.gentoo.osuosl.org
@@ -136,23 +179,23 @@ Host tinderbox
 
 Host alpha
 	HostName monolith.freenet-rz.de
-	IdentityFile ~/.ssh/id_dsa.vapier
+	IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### AMD64 ###
 
-Host amd64 skimmer
-	HostName skimmer.gentoo.org
-	IdentityFile ~/.ssh/id_dsa.vapier
-
-Host poseidon
-	HostName poseidon.amd64.dev.gentoo.org
-	IdentityFile ~/.ssh/id_dsa.vapier
+Host amd64
+	HostName nightheron.gentoo.org
+	IdentityFile ~/.ssh/id_rsa.vapier
 
 ### ARM ###
 
 Host coral
 	HostName coral.gentoo.osuosl.org
-	IdentityFile ~/.ssh/id_dsa.vapier
+	IdentityFile ~/.ssh/id_rsa.vapier
+
+Host polyp
+	HostName polyp.arm.dev.gentoo.org
+	IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### GBSD ###
 
@@ -161,16 +204,23 @@ Host coral
 
 Host hake
 	HostName hppa.gentoo.osuosl.org
-	IdentityFile ~/.ssh/id_dsa.vapier
+	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 ###
 
 Host beluga
 	HostName beluga.ia64.dev.gentoo.org
-	IdentityFile ~/.ssh/id_dsa.vapier
-Host ia64
-	HostName i2.gentoo.osuosl.org
-	IdentityFile ~/.ssh/id_dsa.vapier
+	IdentityFile ~/.ssh/id_rsa.vapier
+Host ia64 guppy
+	HostName guppy.ia64.dev.gentoo.org
+	IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### M68K ###
 
@@ -179,42 +229,47 @@ Host kolla
 
 ### MIPS ###
 
-Host raq2
-	HostName raq2.gentoo.osuosl.org
+Host mips
+	HostName fulong-spark.mips64.dev.gentoo.org
 
 ### PPC ###
 
-Host ppc
-	HostName rooster.ppc64.dev.gentoo.org
-	IdentityFile ~/.ssh/id_rsa.vapier
-
-Host ppc2
+Host ppc ppc64
 	HostName timberdoodle.gentoo.osuosl.org
-	IdentityFile ~/.ssh/id_rsa.vapier
+	IdentityFile ~/.ssh/id_ed25519.vapier
+
+Host ppcle ppc64le
+	HostName bogsucker.gentoo.osuosl.org
+	IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### S390 ###
 
-Host lgentoo1
-	HostName 148.100.96.97
+Host lgentoo3
+	HostName lgentoo3.s390.gentoo.wh0rd.org
+	HostName 148.100.88.31
 	IdentityFile ~/.ssh/id_rsa.vapier
-Host lgentoo2
-	HostName 148.100.96.98
+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
-
 ### SPARC ###
 
 Host sparc
 	HostName bender.sparc.dev.gentoo.org
-	Port 2223
-	IdentityFile ~/.ssh/id_dsa.vapier
+	IdentityFile ~/.ssh/id_ed25519.vapier
 
 ### SH ###
 
 Host lantank
 	HostName lantank.sh.dev.gentoo.org
-	IdentityFile ~/.ssh/id_dsa.vapier
+	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