From d58002eb56cd7cc01d3ce12d8b0d290b97788dac Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Wed, 26 Jan 2022 14:38:00 +0100
Subject: Update SSH configs to use AWS SSM for work connections

---
 .ssh/config.d/mintlab-lab |  2 +-
 .ssh/config.d/mintlab-prd | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

(limited to '.ssh')

diff --git a/.ssh/config.d/mintlab-lab b/.ssh/config.d/mintlab-lab
index 99f37b2..ef1428b 100644
--- a/.ssh/config.d/mintlab-lab
+++ b/.ssh/config.d/mintlab-lab
@@ -1,6 +1,6 @@
 Host *.lab.zsys.nl
 	IdentityFile ~/.ssh/id.d/%u@%L-ed25519.pub
-	ProxyCommand zs-ec2-ssh "$(zs-ec2-id -p default %h)" "%r" "%p" "$HOME/.ssh/id.d/$USER@$(hostname -s)-ed25519.pub"
+	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)"
 	StrictHostKeyChecking no
 	User mintlab
 	UserKnownHostsFile /dev/null
diff --git a/.ssh/config.d/mintlab-prd b/.ssh/config.d/mintlab-prd
index 4f6dbdd..a844ebb 100644
--- a/.ssh/config.d/mintlab-prd
+++ b/.ssh/config.d/mintlab-prd
@@ -1,19 +1,18 @@
-Host bastion.prd.zsys.nl
-	ProxyJump caeghi
-	ForwardAgent yes
+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 bttw.prd.zsys.nl
-	ProxyJump bastion.prd.zsys.nl
-	User mintlab
+Host bastion.prd.zsys.nl
+	Hostname bastion-host-zaaksysteem-prd
 
-Host buildbox.prd.zsys.nl
-	ProxyJump bastion.prd.zsys.nl
-	User mintlab
+Host revproxy-mlb-0.prd.zsys.nl
+	Hostname revproxy-mlb-0
 
-Host *.prd.zsys.nl
-	ProxyJump bastion.lab.zsys.nl
-	User mintlab
+Host revproxy-mlb-1.prd.zsys.nl
+	Hostname revproxy-mlb-1
 
 Host vpn.mintlab.nl
 	User mintlab
-- 
cgit v1.1