From 75ddd49eadf6b2dbc45b8230e9561888ef0bd31a Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <lwirzenius@wikimedia.org>
Date: Fri, 6 Mar 2020 17:33:35 +0200
Subject: Add: ssh config

---
 make-symlinks   |  4 +++-
 ssh/config      |  4 ++++
 ssh/config-pers |  0
 ssh/config-wmf  | 28 ++++++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 ssh/config
 create mode 100644 ssh/config-pers
 create mode 100644 ssh/config-wmf

diff --git a/make-symlinks b/make-symlinks
index 02adaf4..2d8e830 100755
--- a/make-symlinks
+++ b/make-symlinks
@@ -25,7 +25,6 @@ files="
     emacs 
     git-global-ignore
     mailcap
-    people.json
     profile
     screenrc
     signature
@@ -33,6 +32,9 @@ files="
     taskrc
     vimrc
     xsessionrc
+    ssh/config
+    ssh/config-wmf
+    ssh/config-pers
 "
 
 for x in $files
diff --git a/ssh/config b/ssh/config
new file mode 100644
index 0000000..af407b1
--- /dev/null
+++ b/ssh/config
@@ -0,0 +1,4 @@
+# This is my dancing and singing ssh client config file.
+
+Include config-wmf
+Include config-pers
diff --git a/ssh/config-pers b/ssh/config-pers
new file mode 100644
index 0000000..e69de29
diff --git a/ssh/config-wmf b/ssh/config-wmf
new file mode 100644
index 0000000..3240f57
--- /dev/null
+++ b/ssh/config-wmf
@@ -0,0 +1,28 @@
+# SSH client configuration for WMF use.
+
+# Turn this on for Match to work.
+CanonicalizeHostname yes
+
+# Defaults for all WMF hosts.
+Match host=*.wikimedia.org,*.wmnet
+    ForwardAgent no
+    IdentitiesOnly yes
+    KbdInteractiveAuthentication no
+    PasswordAuthentication no
+    User liw
+    UserKnownHostsFile ~/.ssh/known_hosts.d/wmf-prod
+
+# Configure the initial connection to the bastion host, with the one
+# HostName closest to you
+Host bast
+    HostName bast3004.wikimedia.org
+    IdentityFile ~/.ssh/prod.key
+
+# Proxy all connections to internal servers through the bastion host
+Host *.wmnet
+    ProxyJump bast
+    IdentityFile ~/.ssh/prod.key
+
+Host gerrit.wikimedia.org
+    Port 29418
+    IdentityFile ~/.ssh/lab.key
-- 
cgit v1.2.1