X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/67604bf794a387a26a86ebfbc435ca81a3f39a81..445c96856d9fc6ddd78eb60c928e1cbf50767b16:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index ea8f471..e388965 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -69,54 +69,18 @@ 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 bike.madduck.net | bike
-  ForwardAgent yes
-  Hostname bike.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
+### UNI ZURICH MACHINES
 
-Host sysyphus.madduck.net | sysyphus
+Host gig.madduck.net | gig
   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
+  Hostname gig.madduck.net
 
 Host eugene.madduck.net | eugene
   ForwardAgent yes
   Hostname eugene.madduck.net
+Host eugene-luks
+  Hostname eugene.madduck.net
+  User root
 
 Host diamond.madduck.net | diamond
   ForwardAgent yes
@@ -155,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
@@ -362,8 +285,12 @@ Host gitlab.debian.net | git.fosscommunity.in
   User gitlab
 
 Host grimble.mtfk.de | grimble | mtfk
+  CheckHostIP no
   Hostname grimble.mtfk.de
-  Port 22
+
+Host lion.mjollnir.org | lion
+  Hostname lion.mjollnir.org
+  User madduck
 
 ### DEFAULTS