X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/07badb4222072dac3d7f21e450f7db304308dae5..919bfb65cea1c2a00b77046abc3f8a4ad914e558:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 54f7d2b..049362d 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -15,11 +15,12 @@ Host charade-vnc
   Hostname charade.madduck.net
 
 Host matilda.madduck.net | matilda
-  StrictHostKeyChecking no
-  UserKnownHostsFile /dev/null
+  ForwardAgent yes
   Hostname matilda.madduck.net
-  ControlMaster no
-  ControlPath none
+
+Host vizier.madduck.net | vizier
+  ForwardAgent yes
+  Hostname vizier.madduck.net
 
 ### KHYBER KVM HOST
 
@@ -31,10 +32,6 @@ Host khyber-vnc
   ControlPath none
   Hostname khyber.madduck.net
 
-Host vera.madduck.net | vera
-  ForwardAgent yes
-  Hostname vera.madduck.net
-
 Host lotus.madduck.net | lotus
   ForwardAgent yes
   Hostname lotus.madduck.net
@@ -71,10 +68,6 @@ Host imap.madduck.net
 Host aika.krafftwerk.de | aika
   Hostname aika.krafftwerk.de
 
-Host vizier.madduck.net | vizier
-  ForwardAgent yes
-  Hostname vizier.madduck.net
-
 Host sysyphus.madduck.net | sysyphus
   ForwardAgent yes
   Hostname sysyphus.madduck.net
@@ -141,7 +134,7 @@ Host swan.madduck.net | swan
   Hostname swan.madduck.net
 
 ### ARNOLD / GPLHOST
-#
+
 Host arnold-host | arnold-host.madduck.net
   Hostname arnold-host.madduck.net
   User xen05
@@ -164,17 +157,10 @@ Host juliae
   ForwardX11 yes
   HostKeyAlias julia.gern.madduck.net
 
-Host albatross.lehel.madduck.net | albatross
-  Hostname albatross.lehel.madduck.net
+Host fishbowl.gern.madduck.net | fishbowl.gern
   ForwardAgent yes
   ForwardX11 yes
-Host albatrosse
-  Hostname wall.gern.madduck.net
-  Port 22032
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-  HostKeyAlias albatross.lehel.madduck.net
+  HostKeyAlias fishbowl.gern
 
 Host galaxy-s2.phones.gern | galaxy-s2
   Hostname galaxy-s2.phones.gern
@@ -197,6 +183,24 @@ Host clegg.lehel.madduck.net | clegg
   ForwardAgent yes
   Hostname clegg.lehel.madduck.net
 
+Host albatross.lehel.madduck.net | albatross.lehel | albatross
+  Hostname albatross.lehel.madduck.net
+  ForwardAgent yes
+  ForwardX11 yes
+  HostKeyAlias albatross.lehel
+Host albatrosse
+  Hostname wall.lehel.madduck.net
+  Port 22032
+  CheckHostIP no
+  ForwardAgent yes
+  ForwardX11 yes
+  HostKeyAlias albatross.lehel
+
+Host fishbowl.lehel.madduck.net | fishbowl.lehel
+  ForwardAgent yes
+  ForwardX11 yes
+  HostKeyAlias fishbowl.lehel
+
 ### GAUTING
 
 Host embryo.gauting.madduck.net | embryo
@@ -231,12 +235,7 @@ Host bricke
 
 ### ROAD WARRIORS
 
-Host lapse.rw.madduck.net | lapse.gern.madduck.net | lapse
-  CheckHostIP no
-  ForwardAgent yes
-  ForwardX11 yes
-
-Host fishbowl.rw.madduck.net | fishbowl.gern.madduck.net | fishbowl
+Host fishbowl
   CheckHostIP no
   ForwardAgent yes
   ForwardX11 yes