From f4b1128e6311602ded8a72d83e7a41242451baac Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <lwirzenius@wikimedia.org>
Date: Wed, 25 Mar 2020 20:22:06 +0200
Subject: Change: ssh/config-wmf for beta cluster accesss

---
 ssh/config-wmf | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ssh/config-wmf b/ssh/config-wmf
index 7778d15..b6f6613 100644
--- a/ssh/config-wmf
+++ b/ssh/config-wmf
@@ -4,7 +4,7 @@
 CanonicalizeHostname yes
 
 # Defaults for all WMF hosts.
-Match host=*.wikimedia.org,*.wmnet
+Match host=*.wikimedia.org,*.wmnet,*.wmflabs,*.wmflabs.org
     ForwardAgent no
     IdentitiesOnly yes
     KbdInteractiveAuthentication no
@@ -18,11 +18,19 @@ Host bast
     HostName bast3004.wikimedia.org
     IdentityFile ~/.ssh/prod.key
 
+Host labsbast
+    HostName primary.bastion.wmflabs.org
+    IdentityFile ~/.ssh/lab.key
+
 # Proxy all connections to internal servers through the bastion host
 Host *.wmnet *.wikimedia.org !gerrit.wikimedia.org !bast*.wikimedia.org
     ProxyJump bast
     IdentityFile ~/.ssh/prod.key
 
+Host *.wmflabs
+    ProxyJump labsbast
+    IdentityFile ~/.ssh/lab.key
+
 Host gerrit.wikimedia.org
     Port 29418
     IdentityFile ~/.ssh/lab.key
-- 
cgit v1.2.1