Update ssh configs

5 files changed, 45 insertions, 95 deletions

diff --git a/.ssh/config b/.ssh/config
index e7b963a..7242dbf 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -1,7 +1,8 @@
 IdentityFile ~/.ssh/id.d/%u@%L-ed25519
-UserKnownHostsFile ~/.ssh/known_hosts.d/global ~/.ssh/known_hosts.d/local
+UserKnownHostsFile ~/.ssh/known_hosts
+Include config.d/*
 
-Host home home.tyil.nl
+Host home.tyil.nl
 	Hostname 10.57.100.7
 	ForwardAgent yes
 
@@ -36,47 +37,3 @@ Host 192.168.122.*
 	User root
 	StrictHostKeyChecking no
 	UserKnownHostsFile /dev/null
-
-# Include config.d/mintlab
-Host *.zsys.nl
-	StrictHostKeyChecking no
-	UserKnownHostsFile /dev/null
-
-Host bastion.*.zsys.nl
-	ProxyJump caeghi
-	ForwardAgent yes
-	User mintlab
-
-Host bttw.prd.zsys.nl
-	ProxyJump bastion.prd.zsys.nl
-	User mintlab
-
-Host buildbox.prd.zsys.nl
-	ProxyJump bastion.prd.zsys.nl
-	User mintlab
-
-Host *.lab.zsys.nl
-	ProxyJump bastion.lab.zsys.nl
-	User mintlab
-
-Host pgbouncer.lab.zsys.nl
-	ProxyJump bastion.lab.zsys.nl
-	User ubuntu
-
-Host vpn.mintlab.nl
-	User mintlab
-
-Host wiki.zaaksysteem.nl
-	ProxyJump caeghi
-	User mintlab
-	Hostname www01.mintlab.nl
-
-Host *.competent.nl
-	User patrick
-
-# Include config.d/raku
-Host rakudo.org
-	IdentityFile ~/.ssh/id.d/sessifet_rsa
-	Hostname lavm-perl6infra-1.atikon.io
-	User rakudo.org
-	Port 2222
diff --git a/.ssh/config.d/mintlab b/.ssh/config.d/mintlab
new file mode 100644
index 0000000..a340db3
--- /dev/null
+++ b/.ssh/config.d/mintlab
@@ -0,0 +1,5 @@
+Host *.zsys.nl
+	StrictHostKeyChecking no
+	UserKnownHostsFile /dev/null
+
+# vim: set ft=sshconfig :
diff --git a/.ssh/config.d/mintlab-lab b/.ssh/config.d/mintlab-lab
new file mode 100644
index 0000000..99f37b2
--- /dev/null
+++ b/.ssh/config.d/mintlab-lab
@@ -0,0 +1,11 @@
+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"
+	StrictHostKeyChecking no
+	User mintlab
+	UserKnownHostsFile /dev/null
+
+Host bastion.lab.zsys.nl
+	Hostname bastion-host-zaaksysteem-lab
+
+# vim: set ft=sshconfig :
diff --git a/.ssh/config.d/mintlab-prd b/.ssh/config.d/mintlab-prd
new file mode 100644
index 0000000..4f6dbdd
--- /dev/null
+++ b/.ssh/config.d/mintlab-prd
@@ -0,0 +1,26 @@
+Host bastion.prd.zsys.nl
+	ProxyJump caeghi
+	ForwardAgent yes
+	User mintlab
+
+Host bttw.prd.zsys.nl
+	ProxyJump bastion.prd.zsys.nl
+	User mintlab
+
+Host buildbox.prd.zsys.nl
+	ProxyJump bastion.prd.zsys.nl
+	User mintlab
+
+Host *.prd.zsys.nl
+	ProxyJump bastion.lab.zsys.nl
+	User mintlab
+
+Host vpn.mintlab.nl
+	User mintlab
+
+Host wiki.zaaksysteem.nl
+	ProxyJump caeghi
+	User mintlab
+	Hostname www01.mintlab.nl
+
+# vim: set ft=sshconfig :
diff --git a/.ssh/known_hosts.d/global b/.ssh/known_hosts.d/global
deleted file mode 100644
index 0c89186..0000000
--- a/.ssh/known_hosts.d/global
+++ /dev/null
@@ -1,49 +0,0 @@
-# VPN
-10.24.10.10 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBParr4i3L6MJ86cJwjg50M0S3n13zj1ph0CpqgMmYZM7k/aXk7kJiOATVFJAFRQten+84N1sJRzpPefFPJW9/6g=
-10.24.10.20 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAdz+5Cgsd1VzopB+zYm5WCRtqoS19UXwD6Q3zqZH+4XdTWkL/pQck6yhildQA9A1nJbXlRl3oCKaA20bWomoDU=
-10.24.40.1 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLpOlQ7Dvgbi2Cl22chYwQJwmoYl2Fp8yfDA28/Pzchha+zAAUXgoSlyHPIhH0zYXu5qrMayz/gpGPrkYGyO0hY=
-10.24.100.1 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAbJim2F0ZLib/xxfDPT8UKyKAY9g5gL+LQ1amq+LHME/GIFOCS4e6JcaZEYHhzV+wNdc4ALkfG0RMGvNZa8ZKE=
-10.24.100.3 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK2/yK7d7FjQ+TaoK+o+p7S85tunPljn1FbxRdeMhYEjDwpB2NddCRHYoGXh/bWXjWAYiEpaPBfJciyQYE24KtY=
-10.24.100.4 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFkA4wvgkR7vCoBgdf9up2IlNSLyqncTGb/sZR/uasbiDVkpVf7KOgxZbRinZ2Q3Zpk4miYQMcoh6DHBYTk+YIg=
-10.24.100.5 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPJv1E114Rl1/2NN71QcEI+mwUs/wSaTHVAt3eNlgN3S55quTTYul2XyOAvos97xyLysCvstS1mkPASMVz+ggFY=
-10.24.100.6 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAqqD/+uKvFkvnJxdvia48CtFM4fAw44R/TpZiOfAv5+o5+yRcFO7Gfp3z8+C0ACZdxl7OtqiRzD9AE67H2fq/8=
-10.24.100.7,home.tyil.nl ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLIvl5ciNlSPt8qW+AB1fYQRvRRdRB4eiO9TB6SBL0oqcwqcI7REBz7cQnRhKTQzEsLSUc08oaxKRibbbqwRVO0=
-
-# Personal servers
-caeghi.tyil.net,116.202.102.33 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPJv1E114Rl1/2NN71QcEI+mwUs/wSaTHVAt3eNlgN3S55quTTYul2XyOAvos97xyLysCvstS1mkPASMVz+ggFY=
-denahnu.tyil.net ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAqqD/+uKvFkvnJxdvia48CtFM4fAw44R/TpZiOfAv5+o5+yRcFO7Gfp3z8+C0ACZdxl7OtqiRzD9AE67H2fq/8=
-kube0.tyil.net,178.162.131.11 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBParr4i3L6MJ86cJwjg50M0S3n13zj1ph0CpqgMmYZM7k/aXk7kJiOATVFJAFRQten+84N1sJRzpPefFPJW9/6g=
-lists.dblug.nl,80.211.179.238 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDkkx9tNooFRaAkNgZ+79yldKLC5fIwDJreKWzzh82p3gjB8LIR9OjuF30Jh5vSSWiLl25KWsjCXQW09NRABECc=
-minion4.tyil.net,116.203.88.186 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAdz+5Cgsd1VzopB+zYm5WCRtqoS19UXwD6Q3zqZH+4XdTWkL/pQck6yhildQA9A1nJbXlRl3oCKaA20bWomoDU=
-minion5.tyil.net,116.203.82.157 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFQ6T3xwyBmQ73qLqc60YupMOxeq5L5ojpRwEQefI0ohg36L5PiunGt0hDK5B7+aX6v7s1Qpzi1sjL7IfRT2KDA=
-minion6.tyil.net,116.203.136.58 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOoy3n+I2CfCE5dak1tLw5xguDGUD66F02rTzO03m3du8kSR8XFRaUhwoq+Fc70og4TAldmObFyXQtugZg1eAds=
-store0-0 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLpOlQ7Dvgbi2Cl22chYwQJwmoYl2Fp8yfDA28/Pzchha+zAAUXgoSlyHPIhH0zYXu5qrMayz/gpGPrkYGyO0hY=
-store0-0.tyil.net,37.59.61.70 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLpOlQ7Dvgbi2Cl22chYwQJwmoYl2Fp8yfDA28/Pzchha+zAAUXgoSlyHPIhH0zYXu5qrMayz/gpGPrkYGyO0hY=
-tyil.email,81.2.255.186 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDCv3CP4eRfkGgx7IDKoi4X6nz4E8GzhLEmoXfhcMudCD4qXXtXyVSOgvAlbiIdV1IdNngDWsPJtAh6wRYZomU4=
-
-10.57.100.7 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLIvl5ciNlSPt8qW+AB1fYQRvRRdRB4eiO9TB6SBL0oqcwqcI7REBz7cQnRhKTQzEsLSUc08oaxKRibbbqwRVO0=
-10.57.20.3 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDCv3CP4eRfkGgx7IDKoi4X6nz4E8GzhLEmoXfhcMudCD4qXXtXyVSOgvAlbiIdV1IdNngDWsPJtAh6wRYZomU4=
-10.57.100.3 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK2/yK7d7FjQ+TaoK+o+p7S85tunPljn1FbxRdeMhYEjDwpB2NddCRHYoGXh/bWXjWAYiEpaPBfJciyQYE24KtY=
-10.57.100.4 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFkA4wvgkR7vCoBgdf9up2IlNSLyqncTGb/sZR/uasbiDVkpVf7KOgxZbRinZ2Q3Zpk4miYQMcoh6DHBYTk+YIg=
-10.57.20.2 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPJv1E114Rl1/2NN71QcEI+mwUs/wSaTHVAt3eNlgN3S55quTTYul2XyOAvos97xyLysCvstS1mkPASMVz+ggFY=
-81.2.254.110 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAqqD/+uKvFkvnJxdvia48CtFM4fAw44R/TpZiOfAv5+o5+yRcFO7Gfp3z8+C0ACZdxl7OtqiRzD9AE67H2fq/8=
-10.57.20.5 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEcFDrEj8dkVI/iFnQrO/WvLSjwlqmbtIjvfdAIQpRAGeCLtPbPdpw6zyrpiDGpY+GYxpTHR8R5CLJY5vaHlzNY=
-10.57.20.4 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAqqD/+uKvFkvnJxdvia48CtFM4fAw44R/TpZiOfAv5+o5+yRcFO7Gfp3z8+C0ACZdxl7OtqiRzD9AE67H2fq/8=
-
-# Mintlab
-app01.acceptatie.competent.nl,10.1.2.152 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLP2K5KG4lOhQLSjJU/a0w/z1N46AIxXJtj4vXSDt9pgiF2RJmTwap5IZLP8j19y4FvGIA6RCg+QsvoJQRG/yvM=
-bastion.lab.zsys.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDnx0/mKLiAoOBoJzqwWRgJvT2JmNE9dmvXO5mDbblRi
-bastion.prd.zsys.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEZJyoWoEws3a9UV6a5WLaxkqYBljHbFHgeXl6D0kyoD
-bttw.prd.zsys.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBwTTFtpF/vko0fYEA8ZNFv3jIItijxdWeawPIh+KUH0
-git-codecommit.eu-central-1.amazonaws.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4kbf66iCilEMHyqQECD6qtnTeuDWmZTUivSKzt34UIvrT1Vy5wQcawEOb3EfJ+xgOkvQKXUe/knsAL3w4RCoahscybyI2udigj3T3j4LOZXeRFXLCpw2lDxlW0CXEMUSarzXzr2RgGv279ga2bs96SvhCaJUflze9loh19/oykfoHEavlfIwm1BOTIJOgy6rZecrVRPQzSbSnFMIKd9fkx/9KBzGGmx+Kvl7yNzz/OsuAYZxYd7HIHHhk9kpzLLXDVLQZQ4Lh5Xt9Jpi7Zcoej7kvywGd2vQfW4C5mcuHWLvBeM7m/sDTsqGWEriTYaoxrMmCtftGevRniHhOjUKT
-git.competent.nl,10.1.1.22 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGyIPNnFxvDy/1JyLTOqa8V/s0I2+/qT1HJQaijOP1BkPoPCQXIN9eyiWCTbrJKS1WgSVDQ+ec5zL6Ssd1Kp1SM=
-wiki.zaaksysteem.nl,149.210.141.108 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMGFahBTZLv06rMvssMTmjUaxOyIGL0Zjr409jbECxYq
-www01.mintlab.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMGFahBTZLv06rMvssMTmjUaxOyIGL0Zjr409jbECxYq
-
-# rsync.net
-zh1193.rsync.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJtclizeBy1Uo3D86HpgD3LONGVH0CJ0NT+YfZlldAJd
-
-# Misc
-git.sr.ht ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMZvRd4EtM7R+IHVMWmDkVU3VLQTSwQDSAvW0t2Tkj60
-github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-gitlab.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf