X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/f245b1456fa8c87b076dde8bb65df97d2fe67612..cf28ebbd1ca5a397d996fab3332ab8b518aac749:/.ssh/config.in?ds=inline

diff --git a/.ssh/config.in b/.ssh/config.in
index aa61334..a9b5373 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -53,6 +53,10 @@ Host pulse.madduck.net | pulse
   ForwardAgent yes
   Hostname pulse.madduck.net
 
+Host vera.madduck.net | vera
+  ForwardAgent yes
+  Hostname vera.madduck.net
+
 Host seamus.madduck.net | seamus
   ForwardAgent yes
   Hostname seamus.madduck.net
@@ -65,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
-  ForwardAgent yes
-  Hostname sysyphus.madduck.net
-Host ssh443.madduck.net | ssh443
-  HostKeyAlias sysyphus.madduck.net
+Host gig.madduck.net | gig
   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
@@ -358,8 +326,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