X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/d54eb6cda3d828a81f984ce65a72f4c126c5c4a7..ec1347c23f07a75c940567e3628a9a5b4b8d5ee8:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index d2586e6..a62c746 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -69,45 +69,6 @@ Host lunatic.madduck.net | lunatic
   ForwardAgent yes
   Hostname lunatic.madduck.net
 
-### KHYBER KVM HOST
-
-Host khyber.madduck.net | khyber
-  ForwardAgent yes
-  Hostname khyber.madduck.net
-Host khyber-vnc
-  ControlMaster no
-  ControlPath none
-  Hostname khyber.madduck.net
-
-Host lotus.madduck.net | lotus
-  ForwardAgent yes
-  Hostname lotus.madduck.net
-Host martin-krafft.net
-  User madduck
-  HostKeyAlias lotus.madduck.net
-Host phd.martin-krafft.net
-  User madduck
-  HostKeyAlias lotus.madduck.net
-Host madduck.net
-  User madduck
-  HostKeyAlias lotus.madduck.net
-
-Host domine.madduck.net | domine
-  ForwardAgent yes
-  Hostname domine.madduck.net
-Host imap.madduck.net
-  HostKeyAlias domine.madduck.net
-
-Host sysyphus.madduck.net | sysyphus
-  ForwardAgent yes
-  Hostname sysyphus.madduck.net
-Host ssh443.madduck.net | ssh443
-  HostKeyAlias sysyphus.madduck.net
-  ForwardAgent yes
-  Port 443
-Host openvpn.madduck.net | openvpn
-  HostKeyAlias sysyphus.madduck.net
-
 ### UNI ZURICH MACHINES
 
 Host gig.madduck.net | gig
@@ -158,47 +119,6 @@ Host piper.madduck.net | piper
 Host cirrus.madduck.net | cirrus
   Hostname cirrus.madduck.net
 
-### GERN
-
-Host wall.gern.madduck.net | wall
-  CheckHostIP no
-  ForwardAgent yes
-  Hostname wall.gern.madduck.net
-
-Host julia.gern.madduck.net | julia
-  Hostname julia.gern.madduck.net
-  ForwardAgent yes
-  ForwardX11 yes
-
-Host julia-via-diamond
-  Hostname julia.gern.madduck.net
-  ProxyJump diamond.madduck.net
-
-Host git.gern.madduck.net | git.gern
-  ForwardAgent yes
-  HostKeyAlias julia.gern.madduck.net
-Host annex.gern.madduck.net | annex.gern
-  ForwardAgent yes
-  HostKeyAlias julia.gern.madduck.net
-Host shared.gern.madduck.net | shared.gern
-  ForwardAgent yes
-  HostKeyAlias julia.gern.madduck.net
-
-Host pict.gern.madduck.net | pict
-  Hostname pict.gern.madduck.net
-  ForwardAgent yes
-  ForwardX11 yes
-
-Host jugband.gern.madduck.net | jugband.gern | jugband
-  Hostname jugband.gern.madduck.net
-  ForwardX11 yes
-  ForwardAgent yes
-  HostKeyAlias jugband.gern
-
-Host visitor*.gern.madduck.net | visitor*.gern | visitor*
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
-
 ### LEHEL
 
 Host clegg.lehel.madduck.net | clegg.lehel | clegg
@@ -217,9 +137,9 @@ Host albatross-luks
   UserKnownHostsFile /dev/null
   User root
 
-Host albatross-via-diamond
+Host albatross-via-clegg
   Hostname albatross.lehel.madduck.net
-  ProxyJump diamond.madduck.net
+  ProxyJump clegg.dyndns.madduck.net
 
 Host visitor*.lehel.madduck.net | visitor*.lehel
   StrictHostKeyChecking no