From bb5e0c46e5cf6eb04832e866d72ca35b6f3e3a55 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Fri, 6 May 2022 14:06:57 +0200
Subject: Update SSH configs

---
 .ssh/config               |  3 +++
 .ssh/config.d/mintlab     |  1 +
 .ssh/config.d/mintlab-lab |  1 +
 .ssh/config.d/mintlab-prd | 21 ++++++++++++++-------
 4 files changed, 19 insertions(+), 7 deletions(-)

(limited to '.ssh')

diff --git a/.ssh/config b/.ssh/config
index 7242dbf..86c9a27 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -28,6 +28,9 @@ Host email
 Host faiwoo
 	Hostname 10.57.20.5
 
+Host gaeru
+	Hostname 10.57.20.6
+
 Host rsync.net
 	User zh1193
 	Hostname zh1193.rsync.net
diff --git a/.ssh/config.d/mintlab b/.ssh/config.d/mintlab
index a340db3..c90ce27 100644
--- a/.ssh/config.d/mintlab
+++ b/.ssh/config.d/mintlab
@@ -1,4 +1,5 @@
 Host *.zsys.nl
+	IdentitiesOnly yes
 	StrictHostKeyChecking no
 	UserKnownHostsFile /dev/null
 
diff --git a/.ssh/config.d/mintlab-lab b/.ssh/config.d/mintlab-lab
index fbb472f..9cca614 100644
--- a/.ssh/config.d/mintlab-lab
+++ b/.ssh/config.d/mintlab-lab
@@ -1,5 +1,6 @@
 Host *.lab.zsys.nl
 	IdentityFile ~/.ssh/id.d/%u@%L-ed25519.pub
+	IdentitiesOnly yes
 	ProxyCommand zs-ec2-ssh -P default -k "$HOME/.ssh/id.d/$USER@$(hostname -s)-ed25519.pub" -p "%p" -u "%r" -- "$(zs-ec2-id -P default %h | head -n 1)"
 	StrictHostKeyChecking no
 	User mintlab
diff --git a/.ssh/config.d/mintlab-prd b/.ssh/config.d/mintlab-prd
index 166ae4a..d200918 100644
--- a/.ssh/config.d/mintlab-prd
+++ b/.ssh/config.d/mintlab-prd
@@ -1,10 +1,3 @@
-Host *.prd.zsys.nl
-	IdentityFile ~/.ssh/id.d/%u@%L-ed25519.pub
-	ProxyCommand zs-ec2-ssh -P zs-prd -k "$HOME/.ssh/id.d/$USER@$(hostname -s)-ed25519.pub" -p "%p" -u "%r" -- "$(zs-ec2-id -P zs-prd %h)"
-	StrictHostKeyChecking no
-	User mintlab
-	UserKnownHostsFile /dev/null
-
 Host bastion.prd.zsys.nl
 	Hostname bastion-host-zaaksysteem-prd
 
@@ -31,4 +24,18 @@ Host wiki.zaaksysteem.nl
 	User mintlab
 	Hostname www01.mintlab.nl
 
+Host i-*.prd.zsys.nl
+	IdentityFile ~/.ssh/id.d/%u@%L-ed25519.pub
+	ProxyCommand zs-ec2-ssh -P zs-prd -k "$HOME/.ssh/id.d/$USER@$(hostname -s)-ed25519.pub" -p "%p" -u "%r" -- "$(printf "%%s" "%h" | awk -F. '{ print $1 }')"
+	StrictHostKeyChecking no
+	User mintlab
+	UserKnownHostsFile /dev/null
+
+Host *.prd.zsys.nl
+	IdentityFile ~/.ssh/id.d/%u@%L-ed25519.pub
+	ProxyCommand zs-ec2-ssh -P zs-prd -k "$HOME/.ssh/id.d/$USER@$(hostname -s)-ed25519.pub" -p "%p" -u "%r" -- "$(zs-ec2-id -P zs-prd %h)"
+	StrictHostKeyChecking no
+	User mintlab
+	UserKnownHostsFile /dev/null
+
 # vim: set ft=sshconfig :
-- 
cgit v1.1