ssh_config: update Gentoo systems

diff --git a/.ssh/config b/.ssh/config
index abf834d38eac3d1f74f69f4be8882b23a265e2b8..a8614c406defdb55285c6f6d73ff667b12156041 100644 (file)
--- a/.ssh/config
+++ b/.ssh/config
@@ -9,7 +9,7 @@
 Host localhost
        StrictHostKeyChecking no
 
-Host wh0rd.org
+Host wh0rd.org git.wh0rd.org
        # For openssh
        IdentityFile ~/.ssh/id_ed25519.vapier
        # For dropbear
@@ -173,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
@@ -204,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
@@ -236,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 ###
@@ -249,15 +246,19 @@ Host lgentoo3
        HostName lgentoo3.s390.gentoo.wh0rd.org
        HostName 148.100.88.31
        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_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 ###